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

win: Fix compilation errors for chrome35.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-11 12:19:01 +08:00
parent 497174bbe4
commit 8d4211bd3a
17 changed files with 44 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_menu.cc
View file

@ -251,9 +251,6 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isEnabledAt", &Menu::IsEnabledAt)
.SetMethod("isVisibleAt", &Menu::IsVisibleAt)
.SetMethod("_attachToWindow", &Menu::AttachToWindow)
#if defined(OS_WIN)
.SetMethod("_updateStates", &Menu::UpdateStates)
#endif
.SetMethod("_popup", &Menu::Popup);
}

4
atom/browser/api/atom_api_menu.h
View file

@ -84,10 +84,6 @@ class Menu : public mate::Wrappable,
bool IsEnabledAt(int index) const;
bool IsVisibleAt(int index) const;
#if defined(OS_WIN)
virtual void UpdateStates() = 0;
#endif
DISALLOW_COPY_AND_ASSIGN(Menu);
};

4
atom/browser/api/atom_api_web_contents.cc
View file

@ -193,14 +193,14 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
void WebContents::OnRendererMessage(const base::string16& channel,
const base::ListValue& args) {
// webContents.emit(channel, new Event(), args...);
Emit(UTF16ToUTF8(channel), args, web_contents(), NULL);
Emit(base::UTF16ToUTF8(channel), args, web_contents(), NULL);
}
void WebContents::OnRendererMessageSync(const base::string16& channel,
const base::ListValue& args,
IPC::Message* message) {
// webContents.emit(channel, new Event(sender, message), args...);
Emit(UTF16ToUTF8(channel), args, web_contents(), message);
Emit(base::UTF16ToUTF8(channel), args, web_contents(), message);
}
// static