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

Come correct with line length and constness

Browse source
This commit is contained in:
Paul Betts 2015-02-06 16:31:41 -08:00
parent 0afac1e05a
commit fa6d499a4e
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,8 @@ 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 SetOverlayIcon(const 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);

3
atom/browser/native_window.h
View file

@ -142,7 +142,8 @@ 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 void SetOverlayIcon(const 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();

10
atom/browser/native_window_views.cc
View file

@ -613,7 +613,9 @@ void NativeWindowViews::SetProgressBar(double progress) {
#endif #endif
} }
void NativeWindowViews::SetOverlayIcon(gfx::ImageSkia& overlay, const std::string& description) { void NativeWindowViews::SetOverlayIcon(
const 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;
@ -624,8 +626,12 @@ void NativeWindowViews::SetOverlayIcon(gfx::ImageSkia& overlay, const std::strin
FAILED(taskbar->HrInit()))) { FAILED(taskbar->HrInit()))) {
return; return;
} }
HWND frame = views::HWNDForNativeWindow(GetNativeWindow()); HWND frame = views::HWNDForNativeWindow(GetNativeWindow());
taskbar->SetOverlayIcon(frame, IconUtil::CreateHICONFromSkiaBitmap(overlay.AsBitmap()), description);
taskbar->SetOverlayIcon(frame,
IconUtil::CreateHICONFromSkiaBitmap(overlay.AsBitmap()),
description);
#endif #endif
} }

3
atom/browser/native_window_views.h
View file

@ -73,7 +73,8 @@ class NativeWindowViews : public NativeWindow,
bool IsKiosk() override; bool IsKiosk() override;
void SetMenu(ui::MenuModel* menu_model) override; void SetMenu(ui::MenuModel* menu_model) override;
gfx::NativeWindow GetNativeWindow() override; gfx::NativeWindow GetNativeWindow() override;
void SetOverlayIcon(gfx::ImageSkia& overlay, std::string& description) override; void SetOverlayIcon(const gfx::ImageSkia& overlay,
const std::string& description) override;
void SetProgressBar(double value) override; void SetProgressBar(double value) override;
void SetAutoHideMenuBar(bool auto_hide) override; void SetAutoHideMenuBar(bool auto_hide) override;
bool IsMenuBarAutoHide() override; bool IsMenuBarAutoHide() override;