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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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/ui/cocoa/notifications/message_center_tray_bridge.h" 5 #include "chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_service.h"
11 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chrome/grit/chromium_strings.h" 13 #include "chrome/grit/chromium_strings.h"
15 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
15 #include "components/prefs/pref_service.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #import "ui/base/l10n/l10n_util_mac.h" 17 #import "ui/base/l10n/l10n_util_mac.h"
18 #import "ui/message_center/cocoa/popup_collection.h" 18 #import "ui/message_center/cocoa/popup_collection.h"
19 #include "ui/message_center/message_center.h" 19 #include "ui/message_center/message_center.h"
20 #include "ui/message_center/message_center_tray.h" 20 #include "ui/message_center/message_center_tray.h"
21 21
22 namespace message_center { 22 namespace message_center {
23 23
24 MessageCenterTrayDelegate* CreateMessageCenterTray() { 24 MessageCenterTrayDelegate* CreateMessageCenterTray() {
25 return new MessageCenterTrayBridge(g_browser_process->message_center()); 25 return new MessageCenterTrayBridge(g_browser_process->message_center());
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 bool MessageCenterTrayBridge::IsContextMenuEnabled() const { 62 bool MessageCenterTrayBridge::IsContextMenuEnabled() const {
63 return false; 63 return false;
64 } 64 }
65 65
66 message_center::MessageCenterTray* 66 message_center::MessageCenterTray*
67 MessageCenterTrayBridge::GetMessageCenterTray() { 67 MessageCenterTrayBridge::GetMessageCenterTray() {
68 return tray_.get(); 68 return tray_.get();
69 } 69 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698