chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc - Issue 16702003: Move ShellWindow into apps component.

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

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Feedback Created 7 years, 6 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/ui/apps/chrome_shell_window_delegate.cc ('K') | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/keyboard_overlay/keyboard_overlay_view.h"	7 #include "ash/keyboard_overlay/keyboard_overlay_view.h"

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

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

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

(...skipping 11 matching lines...) Expand all Loading...
22 #include "chrome/browser/profiles/profile_manager.h"	22 #include "chrome/browser/profiles/profile_manager.h"

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

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

25 #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/window_positioner.h"	26 #include "chrome/browser/ui/ash/window_positioner.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/browser/ui/extensions/application_launch.h"	30 #include "chrome/browser/ui/extensions/application_launch.h"

31 #include "chrome/browser/ui/extensions/native_app_window.h"	31 #include "chrome/browser/ui/extensions/native_app_window.h"

32 #include "chrome/browser/ui/extensions/shell_window.h"

33 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"	32 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"

34 #include "chrome/common/chrome_notification_types.h"	33 #include "chrome/common/chrome_notification_types.h"

35 #include "chrome/common/chrome_switches.h"	34 #include "chrome/common/chrome_switches.h"

36 #include "chrome/common/pref_names.h"	35 #include "chrome/common/pref_names.h"

37 #include "chrome/common/url_constants.h"	36 #include "chrome/common/url_constants.h"

38 #include "chromeos/chromeos_switches.h"	37 #include "chromeos/chromeos_switches.h"

39 #include "chromeos/dbus/dbus_thread_manager.h"	38 #include "chromeos/dbus/dbus_thread_manager.h"

40 #include "chromeos/dbus/power_manager_client.h"	39 #include "chromeos/dbus/power_manager_client.h"

41 #include "chromeos/ime/input_method_manager.h"	40 #include "chromeos/ime/input_method_manager.h"

42 #include "content/public/browser/notification_service.h"	41 #include "content/public/browser/notification_service.h"

(...skipping 208 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
251 }	250 }

252	251

253 void ChromeShellDelegate::PlatformInit() {	252 void ChromeShellDelegate::PlatformInit() {

254 registrar_.Add(this,	253 registrar_.Add(this,

255 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,	254 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,

256 content::NotificationService::AllSources());	255 content::NotificationService::AllSources());

257 registrar_.Add(this,	256 registrar_.Add(this,

258 chrome::NOTIFICATION_SESSION_STARTED,	257 chrome::NOTIFICATION_SESSION_STARTED,

259 content::NotificationService::AllSources());	258 content::NotificationService::AllSources());

260 }	259 }

OLD	NEW