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

Fix compilation errors on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-03-10 15:57:03 +09:00
parent 20466bad8f
commit cadd1969d9
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chromium_src/chrome/browser/ui/views/color_chooser_win.cc
View file

@ -9,8 +9,10 @@
#include "chrome/browser/ui/views/color_chooser_dialog.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "ui/aura/window.h"
#include "ui/views/color_chooser/color_chooser_listener.h"
class ColorChooserWin : public content::ColorChooser,
@ -55,9 +57,11 @@ ColorChooserWin* ColorChooserWin::Open(content::WebContents* web_contents,
ColorChooserWin::ColorChooserWin(content::WebContents* web_contents,
SkColor initial_color)
: web_contents_(web_contents) {
gfx::NativeWindow owning_window = (gfx::NativeWindow)::GetAncestor(
(HWND)web_contents->GetRenderViewHost()->GetView()->GetNativeView(),
GA_ROOT);
gfx::NativeWindow owning_window = web_contents->GetRenderViewHost()
->GetWidget()
->GetView()
->GetNativeView()
->GetToplevelWindow();
color_chooser_dialog_ = new ColorChooserDialog(this,
initial_color,
owning_window);