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

Side by Side Diff: chrome/browser/notifications/message_center_settings_controller.cc

Issue 15388002: Supporting high dpi favicons in Instant Extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase Created 7 years, 5 months 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
« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/resources/local_ntp/local_ntp.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/notifications/message_center_settings_controller.h" 5 #include "chrome/browser/notifications/message_center_settings_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/string_compare.h" 10 #include "base/i18n/string_compare.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/extensions/app_icon_loader_impl.h" 12 #include "chrome/browser/extensions/app_icon_loader_impl.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/favicon/favicon_service.h" 14 #include "chrome/browser/favicon/favicon_service.h"
15 #include "chrome/browser/favicon/favicon_service_factory.h" 15 #include "chrome/browser/favicon/favicon_service_factory.h"
16 #include "chrome/browser/favicon/favicon_types.h"
17 #include "chrome/browser/history/history_types.h" 16 #include "chrome/browser/history/history_types.h"
18 #include "chrome/browser/notifications/desktop_notification_service.h" 17 #include "chrome/browser/notifications/desktop_notification_service.h"
19 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 18 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
20 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" 19 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
21 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 20 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/common/cancelable_task_tracker.h" 23 #include "chrome/common/cancelable_task_tracker.h"
25 #include "chrome/common/extensions/extension_constants.h" 24 #include "chrome/common/extensions/extension_constants.h"
25 #include "chrome/common/favicon/favicon_types.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
27 #include "grit/ui_strings.h" 27 #include "grit/ui_strings.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
31 #include "ui/message_center/message_center_style.h" 31 #include "ui/message_center/message_center_style.h"
32 32
33 #if defined(USE_ASH) 33 #if defined(USE_ASH)
34 #include "ash/shell.h" 34 #include "ash/shell.h"
35 #include "ash/system/web_notification/web_notification_tray.h" 35 #include "ash/system/web_notification/web_notification_tray.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 } 255 }
256 256
257 257
258 void MessageCenterSettingsController::SetAppImage(const std::string& id, 258 void MessageCenterSettingsController::SetAppImage(const std::string& id,
259 const gfx::ImageSkia& image) { 259 const gfx::ImageSkia& image) {
260 FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver, 260 FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
261 observers_, 261 observers_,
262 UpdateIconImage(NotifierId(NotifierId::APPLICATION, id), 262 UpdateIconImage(NotifierId(NotifierId::APPLICATION, id),
263 gfx::Image(image))); 263 gfx::Image(image)));
264 } 264 }
OLDNEW
« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/resources/local_ntp/local_ntp.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698