chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 23075012: Update NetworkStateNotifier to use message_center.

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 23075012: Update NetworkStateNotifier to use message_center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update string ids, handle empty name Created 7 years, 4 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

« chrome/browser/chromeos/status/data_promo_notification.cc ('K') | « chrome/browser/chromeos/status/data_promo_notification.cc ('k') | ui/message_center/notification.h » ('j') | ui/message_center/notification.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"	5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <set>	8 #include <set>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "ash/ash_switches.h"	12 #include "ash/ash_switches.h"

13 #include "ash/desktop_background/desktop_background_controller.h"	13 #include "ash/desktop_background/desktop_background_controller.h"

14 #include "ash/session_state_delegate.h"	14 #include "ash/session_state_delegate.h"

15 #include "ash/session_state_observer.h"	15 #include "ash/session_state_observer.h"

16 #include "ash/shell.h"	16 #include "ash/shell.h"

17 #include "ash/shell_delegate.h"	17 #include "ash/shell_delegate.h"

18 #include "ash/shell_window_ids.h"	18 #include "ash/shell_window_ids.h"

19 #include "ash/system/bluetooth/bluetooth_observer.h"	19 #include "ash/system/bluetooth/bluetooth_observer.h"

20 #include "ash/system/brightness/brightness_observer.h"	20 #include "ash/system/brightness/brightness_observer.h"

21 #include "ash/system/chromeos/network/network_connect.h"	21 #include "ash/system/chromeos/network/network_connect.h"

22 #include "ash/system/chromeos/network/network_observer.h"

23 #include "ash/system/date/clock_observer.h"	22 #include "ash/system/date/clock_observer.h"

24 #include "ash/system/drive/drive_observer.h"	23 #include "ash/system/drive/drive_observer.h"

25 #include "ash/system/ime/ime_observer.h"	24 #include "ash/system/ime/ime_observer.h"

26 #include "ash/system/logout_button/logout_button_observer.h"	25 #include "ash/system/logout_button/logout_button_observer.h"

27 #include "ash/system/tray/system_tray.h"	26 #include "ash/system/tray/system_tray.h"

28 #include "ash/system/tray/system_tray_delegate.h"	27 #include "ash/system/tray/system_tray_delegate.h"

29 #include "ash/system/tray/system_tray_notifier.h"	28 #include "ash/system/tray/system_tray_notifier.h"

30 #include "ash/system/tray_accessibility.h"	29 #include "ash/system/tray_accessibility.h"

31 #include "ash/system/tray_caps_lock.h"	30 #include "ash/system/tray_caps_lock.h"

32 #include "ash/system/user/update_observer.h"	31 #include "ash/system/user/update_observer.h"

(...skipping 1293 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1326 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);	1325 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);

1327 };	1326 };

1328	1327

1329 } // namespace	1328 } // namespace

1330	1329

1331 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {	1330 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {

1332 return new chromeos::SystemTrayDelegate();	1331 return new chromeos::SystemTrayDelegate();

1333 }	1332 }

1334	1333

1335 } // namespace chromeos	1334 } // namespace chromeos

OLD	NEW