Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1472)

Side by Side Diff: chrome/browser/background/background_mode_manager_win.cc

Issue 8351004: Add an extra argument to the DisplayBalloon method to support custom notification icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing argument order as suggested. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/task.h" 10 #include "base/task.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/win/registry.h" 12 #include "base/win/registry.h"
13 #include "chrome/browser/background/background_mode_manager.h" 13 #include "chrome/browser/background/background_mode_manager.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "content/browser/browser_thread.h" 15 #include "content/browser/browser_thread.h"
16 #include "grit/chromium_strings.h" 16 #include "grit/chromium_strings.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
19 20
20 namespace { 21 namespace {
21 22
22 class DisableLaunchOnStartupTask : public Task { 23 class DisableLaunchOnStartupTask : public Task {
23 public: 24 public:
24 virtual void Run(); 25 virtual void Run();
25 }; 26 };
26 27
27 class EnableLaunchOnStartupTask : public Task { 28 class EnableLaunchOnStartupTask : public Task {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 new DisableLaunchOnStartupTask()); 87 new DisableLaunchOnStartupTask());
87 } 88 }
88 } 89 }
89 90
90 void BackgroundModeManager::DisplayAppInstalledNotification( 91 void BackgroundModeManager::DisplayAppInstalledNotification(
91 const Extension* extension) { 92 const Extension* extension) {
92 // Create a status tray notification balloon explaining to the user that 93 // Create a status tray notification balloon explaining to the user that
93 // a background app has been installed. 94 // a background app has been installed.
94 CreateStatusTrayIcon(); 95 CreateStatusTrayIcon();
95 status_icon_->DisplayBalloon( 96 status_icon_->DisplayBalloon(
97 SkBitmap(),
96 l10n_util::GetStringUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE), 98 l10n_util::GetStringUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE),
97 l10n_util::GetStringFUTF16( 99 l10n_util::GetStringFUTF16(
98 IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY, 100 IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY,
99 UTF8ToUTF16(extension->name()), 101 UTF8ToUTF16(extension->name()),
100 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 102 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
101 } 103 }
102 104
103 string16 BackgroundModeManager::GetPreferencesMenuLabel() { 105 string16 BackgroundModeManager::GetPreferencesMenuLabel() {
104 return l10n_util::GetStringUTF16(IDS_OPTIONS); 106 return l10n_util::GetStringUTF16(IDS_OPTIONS);
105 } 107 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/status_icons/status_icon.h » ('j') | chrome/browser/ui/views/status_icons/status_icon_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698