chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc - Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_...""

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/ash/chrome_shell_delegate.h"	5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"

6	6

7 #include "ash/accessibility_delegate.h"	7 #include "ash/accessibility_delegate.h"

8 #include "ash/media_delegate.h"	8 #include "ash/media_delegate.h"

9 #include "ash/wm/mru_window_tracker.h"	9 #include "ash/wm/mru_window_tracker.h"

10 #include "ash/wm/window_util.h"	10 #include "ash/wm/window_util.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/prefs/pref_service.h"	12 #include "base/prefs/pref_service.h"

13 #include "chrome/browser/accessibility/accessibility_events.h"	13 #include "chrome/browser/accessibility/accessibility_events.h"

14 #include "chrome/browser/chrome_notification_types.h"	14 #include "chrome/browser/chrome_notification_types.h"

15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

16 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	16 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

17 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"	17 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"

18 #include "chrome/browser/chromeos/display/display_preferences.h"	18 #include "chrome/browser/chromeos/display/display_preferences.h"

19 #include "chrome/browser/chromeos/extensions/media_player_api.h"	19 #include "chrome/browser/chromeos/extensions/media_player_api.h"

20 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"	20 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"

21 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"

22 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

23 #include "chrome/browser/speech/tts_controller.h"	22 #include "chrome/browser/speech/tts_controller.h"

24 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"	23 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"

25 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"	24 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"

26 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"	25 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"

	26 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"

27 #include "chrome/browser/ui/browser.h"	27 #include "chrome/browser/ui/browser.h"

28 #include "chrome/browser/ui/browser_finder.h"	28 #include "chrome/browser/ui/browser_finder.h"

29 #include "chrome/browser/ui/browser_window.h"	29 #include "chrome/browser/ui/browser_window.h"

30 #include "chrome/common/pref_names.h"	30 #include "chrome/common/pref_names.h"

31 #include "chromeos/chromeos_switches.h"	31 #include "chromeos/chromeos_switches.h"

32 #include "chromeos/dbus/dbus_thread_manager.h"	32 #include "chromeos/dbus/dbus_thread_manager.h"

33 #include "chromeos/dbus/power_manager_client.h"	33 #include "chromeos/dbus/power_manager_client.h"

34 #include "chromeos/ime/input_method_manager.h"	34 #include "chromeos/ime/input_method_manager.h"

35 #include "content/public/browser/notification_service.h"	35 #include "content/public/browser/notification_service.h"

36 #include "content/public/browser/user_metrics.h"	36 #include "content/public/browser/user_metrics.h"

(...skipping 225 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 }	262 }

263	263

264 void ChromeShellDelegate::PlatformInit() {	264 void ChromeShellDelegate::PlatformInit() {

265 registrar_.Add(this,	265 registrar_.Add(this,

266 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,	266 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,

267 content::NotificationService::AllSources());	267 content::NotificationService::AllSources());

268 registrar_.Add(this,	268 registrar_.Add(this,

269 chrome::NOTIFICATION_SESSION_STARTED,	269 chrome::NOTIFICATION_SESSION_STARTED,

270 content::NotificationService::AllSources());	270 content::NotificationService::AllSources());

271 }	271 }

OLD	NEW