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

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

Issue 1420163003: Fixed Windows system tray icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@profile-icon-imagefamily
Patch Set: Fix crash (avoid async call from DisplayClientInstalledNotification). Created 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 20 matching lines...) Expand all
31 BrowserThread::FILE, FROM_HERE, 31 BrowserThread::FILE, FROM_HERE,
32 should_launch ? 32 should_launch ?
33 base::Bind(auto_launch_util::EnableBackgroundStartAtLogin) : 33 base::Bind(auto_launch_util::EnableBackgroundStartAtLogin) :
34 base::Bind(auto_launch_util::DisableBackgroundStartAtLogin)); 34 base::Bind(auto_launch_util::DisableBackgroundStartAtLogin));
35 } 35 }
36 36
37 void BackgroundModeManager::DisplayClientInstalledNotification( 37 void BackgroundModeManager::DisplayClientInstalledNotification(
38 const base::string16& name) { 38 const base::string16& name) {
39 // Create a status tray notification balloon explaining to the user what has 39 // Create a status tray notification balloon explaining to the user what has
40 // been installed. 40 // been installed.
41 CreateStatusTrayIcon(); 41 CreateStatusTrayIconTask();
42 status_icon_->DisplayBalloon( 42 status_icon_->DisplayBalloon(
43 gfx::ImageSkia(), 43 gfx::ImageSkia(),
44 l10n_util::GetStringUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE), 44 l10n_util::GetStringUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE),
45 l10n_util::GetStringFUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY, 45 l10n_util::GetStringFUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY,
46 name, 46 name,
47 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)), 47 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)),
48 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT, 48 message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
49 kAppInstalledNotifierId)); 49 kAppInstalledNotifierId));
50 } 50 }
51 51
52 base::string16 BackgroundModeManager::GetPreferencesMenuLabel() { 52 base::string16 BackgroundModeManager::GetPreferencesMenuLabel() {
53 return l10n_util::GetStringUTF16(IDS_OPTIONS); 53 return l10n_util::GetStringUTF16(IDS_OPTIONS);
54 } 54 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698