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

Style fixups

Browse source
This commit is contained in:
Paul Betts 2015-02-10 17:14:26 -08:00
parent 8a7acfc6c0
commit 86de75deef
5 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}

2
atom/browser/native_window_mac.h
View file

@ -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

2
atom/browser/native_window_mac.mm
View file

@ -679,7 +679,7 @@ void NativeWindowMac::SetProgressBar(double progress) {
}
void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay,
const std::string& description) {
const std::string& description) {
}
void NativeWindowMac::ShowDefinitionForSelection() {

12
atom/browser/native_window_views.cc
View file

@ -10,6 +10,7 @@
#include <string>
#include <vector>
#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
}

1
docs/api/browser-window.md
View file

@ -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.