mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to cbeb16cf544f79c1990f1eae4d4fe (master) (#19610)

Browse source 
Co-authored-by: Erick Zhao <erickzhao@github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by Micha Hanselmann <DeerMichel@github.com>
This commit is contained in:
Electron Bot 2019-08-15 16:50:58 -04:00 • committed by Shelley Vohr
parent 12df0e8994
commit db21391156
71 changed files with 348 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/ui/win/atom_desktop_native_widget_aura.cc
View file

@ -4,6 +4,8 @@
#include "shell/browser/ui/win/atom_desktop_native_widget_aura.h"
#include <utility>
#include "shell/browser/ui/win/atom_desktop_window_tree_host_win.h"
#include "ui/views/corewm/tooltip_controller.h"
#include "ui/wm/public/tooltip_client.h"
@ -20,13 +22,12 @@ AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
}
void AtomDesktopNativeWidgetAura::InitNativeWidget(
const views::Widget::InitParams& params) {
views::Widget::InitParams modified_params = params;
views::Widget::InitParams params) {
desktop_window_tree_host_ = new AtomDesktopWindowTreeHostWin(
native_window_view_,
static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
modified_params.desktop_window_tree_host = desktop_window_tree_host_;
views::DesktopNativeWidgetAura::InitNativeWidget(modified_params);
params.desktop_window_tree_host = desktop_window_tree_host_;
views::DesktopNativeWidgetAura::InitNativeWidget(std::move(params));
}
void AtomDesktopNativeWidgetAura::Activate() {

2
shell/browser/ui/win/atom_desktop_native_widget_aura.h
View file

@ -19,7 +19,7 @@ class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
explicit AtomDesktopNativeWidgetAura(NativeWindowViews* native_window_view);
// views::DesktopNativeWidgetAura:
void InitNativeWidget(const views::Widget::InitParams& params) override;
void InitNativeWidget(views::Widget::InitParams params) override;
// internal::NativeWidgetPrivate:
void Activate() override;

4
shell/browser/ui/win/notify_icon.cc
View file

@ -4,6 +4,8 @@
#include "shell/browser/ui/win/notify_icon.h"
#include <utility>
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/windows_version.h"
@ -215,7 +217,7 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
params.force_software_compositing = true;
params.z_order = ui::ZOrderLevel::kFloatingUIElement;
widget_->Init(params);
widget_->Init(std::move(params));
widget_->Show();
widget_->Activate();