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

Plumb code all the way up

Browse source
This commit is contained in:
Paul Betts 2015-02-06 16:12:32 -08:00
parent 66f2d18d8b
commit 0afac1e05a
4 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_window.cc
View file

@ -487,6 +487,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("capturePage", &Window::CapturePage) .SetMethod("capturePage", &Window::CapturePage)
.SetMethod("print", &Window::Print) .SetMethod("print", &Window::Print)
.SetMethod("setProgressBar", &Window::SetProgressBar) .SetMethod("setProgressBar", &Window::SetProgressBar)
.SetMethod("setOverlayIcon", &Window::SetOverlayIcon)
.SetMethod("setAutoHideMenuBar", &Window::SetAutoHideMenuBar) .SetMethod("setAutoHideMenuBar", &Window::SetAutoHideMenuBar)
.SetMethod("isMenuBarAutoHide", &Window::IsMenuBarAutoHide) .SetMethod("isMenuBarAutoHide", &Window::IsMenuBarAutoHide)
.SetMethod("setMenuBarVisibility", &Window::SetMenuBarVisibility) .SetMethod("setMenuBarVisibility", &Window::SetMenuBarVisibility)

1
atom/browser/api/atom_api_window.h
View file

@ -118,6 +118,7 @@ class Window : public mate::EventEmitter,
void CapturePage(mate::Arguments* args); void CapturePage(mate::Arguments* args);
void Print(mate::Arguments* args); void Print(mate::Arguments* args);
void SetProgressBar(double progress); void SetProgressBar(double progress);
void SetOverlayIcon(gfx::ImageSkia& overlay, const std::string& description);
void SetAutoHideMenuBar(bool auto_hide); void SetAutoHideMenuBar(bool auto_hide);
bool IsMenuBarAutoHide(); bool IsMenuBarAutoHide();
void SetMenuBarVisibility(bool visible); void SetMenuBarVisibility(bool visible);

1
atom/browser/native_window.h
View file

@ -142,6 +142,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual bool HasModalDialog(); virtual bool HasModalDialog();
virtual gfx::NativeWindow GetNativeWindow() = 0; virtual gfx::NativeWindow GetNativeWindow() = 0;
virtual void SetProgressBar(double progress) = 0; virtual void SetProgressBar(double progress) = 0;
virtual void SetOverlayIcon(gfx::ImageSkia& overlay, const std::string& description) = 0;
virtual bool IsClosed() const { return is_closed_; } virtual bool IsClosed() const { return is_closed_; }
virtual void OpenDevTools(); virtual void OpenDevTools();

2
atom/browser/native_window_views.cc
View file

@ -613,7 +613,7 @@ void NativeWindowViews::SetProgressBar(double progress) {
#endif #endif
} }
void NativeWindowViews::SetOverlayIcon(gfx::ImageSkia& overlay, std::string& description) { void NativeWindowViews::SetOverlayIcon(gfx::ImageSkia& overlay, const std::string& description) {
#if defined(OS_WIN) #if defined(OS_WIN)
if (base::win::GetVersion() < base::win::VERSION_WIN7) if (base::win::GetVersion() < base::win::VERSION_WIN7)
return; return;