From 86de75deef987dd5369e124e5577b085e3160cf1 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Tue, 10 Feb 2015 17:14:26 -0800 Subject: [PATCH] Style fixups --- atom/browser/api/atom_api_window.cc | 8 ++------ atom/browser/native_window_mac.h | 2 +- atom/browser/native_window_mac.mm | 4 ++-- atom/browser/native_window_views.cc | 12 ++++++------ docs/api/browser-window.md | 1 - 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index e0e1f5d6da56..81a2d37305ff 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -2,10 +2,6 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -namespace gfx { -class Image; -} - #include "atom/browser/api/atom_api_window.h" #include "atom/browser/api/atom_api_web_contents.h" @@ -13,8 +9,8 @@ class Image; #include "atom/browser/native_window.h" #include "atom/common/native_mate_converters/gfx_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h" -#include "atom/common/native_mate_converters/string16_converter.h" #include "atom/common/native_mate_converters/image_converter.h" +#include "atom/common/native_mate_converters/string16_converter.h" #include "content/public/browser/render_process_host.h" #include "native_mate/callback.h" #include "native_mate/constructor.h" @@ -406,7 +402,7 @@ void Window::SetProgressBar(double progress) { } void Window::SetOverlayIcon(const gfx::Image& overlay, - const std::string& description) { + const std::string& description) { window_->SetOverlayIcon(overlay, description); } diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h index a12f06cbe9b6..884ab9899b45 100644 --- a/atom/browser/native_window_mac.h +++ b/atom/browser/native_window_mac.h @@ -72,7 +72,7 @@ class NativeWindowMac : public NativeWindow { gfx::NativeWindow GetNativeWindow() override; void SetProgressBar(double progress) override; void SetOverlayIcon(const gfx::Image& overlay, - const std::string& description) override; + const std::string& description) override; void ShowDefinitionForSelection() override; // Returns true if |point| in local Cocoa coordinate system falls within diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 5b36370a4a28..cc0a4393f2e6 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -678,8 +678,8 @@ void NativeWindowMac::SetProgressBar(double progress) { [dock_tile display]; } -void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay, - const std::string& description) { +void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay, + const std::string& description) { } void NativeWindowMac::ShowDefinitionForSelection() { diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 89246c3ef1ff..af0c1520c098 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -10,6 +10,7 @@ #include #include + #include "atom/browser/ui/views/menu_bar.h" #include "atom/browser/ui/views/menu_layout.h" #include "atom/common/draggable_region.h" @@ -51,8 +52,8 @@ #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "ui/base/win/shell.h" -#include "ui/gfx/win/dpi.h" #include "ui/gfx/icon_util.h" +#include "ui/gfx/win/dpi.h" #include "ui/views/win/hwnd_util.h" #endif @@ -614,9 +615,8 @@ void NativeWindowViews::SetProgressBar(double progress) { #endif } -void NativeWindowViews::SetOverlayIcon( - const gfx::Image& overlay, - const std::string& description) { +void NativeWindowViews::SetOverlayIcon(const gfx::Image& overlay, + const std::string& description) { #if defined(OS_WIN) if (base::win::GetVersion() < base::win::VERSION_WIN7) return; @@ -632,8 +632,8 @@ void NativeWindowViews::SetOverlayIcon( std::wstring wstr = std::wstring(description.begin(), description.end()); taskbar->SetOverlayIcon(frame, - IconUtil::CreateHICONFromSkBitmap(overlay.AsBitmap()), - wstr.c_str()); + IconUtil::CreateHICONFromSkBitmap(overlay.AsBitmap()), + wstr.c_str()); #endif } diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index d6725bcf405d..51984b374961 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -543,7 +543,6 @@ it will assume `app.getName().desktop`. ### BrowserWindow.setOverlayIcon(overlay, description) * `overlay` [Image](image.md) - the icon to display on the bottom right corner of the Taskbar icon. If this parameter is `null`, the overlay is cleared. - * `description` String - a description that will be provided to Accessibility screenreaders Sets a 16px overlay onto the current Taskbar icon, usually used to convey some sort of application status or to passively notify the user.