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

Merge pull request #5955 from enlight/fix-atom-taskbarhost-typo

Browse source 
Fix typo in `atom::TaskbarHost::InitializeTaskbar()`
This commit is contained in:
Cheng Zhao 2016-06-09 07:11:25 +00:00 committed by GitHub
commit c6eda51b43
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/ui/win/taskbar_host.cc
View file

@ -54,7 +54,7 @@ TaskbarHost::~TaskbarHost() {
bool TaskbarHost::SetThumbarButtons( bool TaskbarHost::SetThumbarButtons(
HWND window, const std::vector<ThumbarButton>& buttons) { HWND window, const std::vector<ThumbarButton>& buttons) {
if (buttons.size() > kMaxButtonsCount || !InitailizeTaskbar()) if (buttons.size() > kMaxButtonsCount || !InitializeTaskbar())
return false; return false;
callback_map_.clear(); callback_map_.clear();
@ -118,7 +118,7 @@ bool TaskbarHost::SetThumbarButtons(
} }
bool TaskbarHost::SetProgressBar(HWND window, double value) { bool TaskbarHost::SetProgressBar(HWND window, double value) {
if (!InitailizeTaskbar()) if (!InitializeTaskbar())
return false; return false;
HRESULT r; HRESULT r;
@ -133,7 +133,7 @@ bool TaskbarHost::SetProgressBar(HWND window, double value) {
bool TaskbarHost::SetOverlayIcon( bool TaskbarHost::SetOverlayIcon(
HWND window, const gfx::Image& overlay, const std::string& text) { HWND window, const gfx::Image& overlay, const std::string& text) {
if (!InitailizeTaskbar()) if (!InitializeTaskbar())
return false; return false;
base::win::ScopedHICON icon( base::win::ScopedHICON icon(
@ -152,7 +152,7 @@ bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
return false; return false;
} }
bool TaskbarHost::InitailizeTaskbar() { bool TaskbarHost::InitializeTaskbar() {
if (FAILED(taskbar_.CreateInstance(CLSID_TaskbarList, if (FAILED(taskbar_.CreateInstance(CLSID_TaskbarList,
nullptr, nullptr,
CLSCTX_INPROC_SERVER)) || CLSCTX_INPROC_SERVER)) ||

4
atom/browser/ui/win/taskbar_host.h
View file

@ -44,8 +44,8 @@ class TaskbarHost {
bool HandleThumbarButtonEvent(int button_id); bool HandleThumbarButtonEvent(int button_id);
private: private:
// Initailize the taskbar object. // Initialize the taskbar object.
bool InitailizeTaskbar(); bool InitializeTaskbar();
using CallbackMap = std::map<int, base::Closure>; using CallbackMap = std::map<int, base::Closure>;
CallbackMap callback_map_; CallbackMap callback_map_;