From 0afac1e05afeb51786c772cef9c807feacc111a5 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Fri, 6 Feb 2015 16:12:32 -0800 Subject: [PATCH] Plumb code all the way up --- atom/browser/api/atom_api_window.cc | 1 + atom/browser/api/atom_api_window.h | 1 + atom/browser/native_window.h | 1 + atom/browser/native_window_views.cc | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index 30e386540b5c..cc7923feab60 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -487,6 +487,7 @@ void Window::BuildPrototype(v8::Isolate* isolate, .SetMethod("capturePage", &Window::CapturePage) .SetMethod("print", &Window::Print) .SetMethod("setProgressBar", &Window::SetProgressBar) + .SetMethod("setOverlayIcon", &Window::SetOverlayIcon) .SetMethod("setAutoHideMenuBar", &Window::SetAutoHideMenuBar) .SetMethod("isMenuBarAutoHide", &Window::IsMenuBarAutoHide) .SetMethod("setMenuBarVisibility", &Window::SetMenuBarVisibility) diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 494519d28f2d..d81a3470b7df 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -118,6 +118,7 @@ class Window : public mate::EventEmitter, void CapturePage(mate::Arguments* args); void Print(mate::Arguments* args); void SetProgressBar(double progress); + void SetOverlayIcon(gfx::ImageSkia& overlay, const std::string& description); void SetAutoHideMenuBar(bool auto_hide); bool IsMenuBarAutoHide(); void SetMenuBarVisibility(bool visible); diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 0f3a8deb7be1..0a9ecaf00dbd 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -142,6 +142,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate, virtual bool HasModalDialog(); virtual gfx::NativeWindow GetNativeWindow() = 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 void OpenDevTools(); diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index db4090b269a9..3d3b857ec365 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -613,7 +613,7 @@ void NativeWindowViews::SetProgressBar(double progress) { #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 (base::win::GetVersion() < base::win::VERSION_WIN7) return;