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

Continue fixing compilation erros on Windows.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-17 18:34:45 +08:00
parent 0215c2fbee
commit 56f709ff1f
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser/api/atom_api_menu_win.cc
View file

@ -10,6 +10,8 @@
#include "ui/gfx/point.h" #include "ui/gfx/point.h"
#include "ui/gfx/screen.h" #include "ui/gfx/screen.h"
#include "common/v8/node_common.h"
namespace atom { namespace atom {
namespace api { namespace api {
@ -40,8 +42,6 @@ void Menu::AttachToWindow(const v8::FunctionCallbackInfo<v8::Value>& args) {
return node::ThrowTypeError("Bad argument"); return node::ThrowTypeError("Bad argument");
static_cast<NativeWindowWin*>(native_window)->SetMenu(self->model_.get()); static_cast<NativeWindowWin*>(native_window)->SetMenu(self->model_.get());
return v8::Undefined();
} }
// static // static

7
browser/native_window_win.cc
View file

@ -439,10 +439,9 @@ void NativeWindowWin::Layout() {
OnViewWasResized(); OnViewWasResized();
} }
void NativeWindowWin::ViewHierarchyChanged(bool is_add, void NativeWindowWin::ViewHierarchyChanged(
views::View* parent, const ViewHierarchyChangedDetails& details) {
views::View* child) { if (details.is_add && details.child == this)
if (is_add && child == this)
AddChildView(web_view_); AddChildView(web_view_);
} }

5
browser/native_window_win.h
View file

@ -87,9 +87,8 @@ class NativeWindowWin : public NativeWindow,
// Overridden from views::View: // Overridden from views::View:
virtual void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
virtual void ViewHierarchyChanged(bool is_add, virtual void ViewHierarchyChanged(
views::View* parent, const ViewHierarchyChangedDetails& details) OVERRIDE;
views::View* child) OVERRIDE;
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
// Overridden from views::WidgetDelegate: // Overridden from views::WidgetDelegate: