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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error 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
« apps/shell_window.h ('K') | « chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "apps/native_app_window.h"
7 #include "ash/keyboard_overlay/keyboard_overlay_view.h" 8 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
8 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
11 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
13 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 14 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
14 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 15 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
15 #include "chrome/browser/chromeos/display/display_preferences.h" 16 #include "chrome/browser/chromeos/display/display_preferences.h"
16 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" 17 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
17 #include "chrome/browser/chromeos/extensions/media_player_api.h" 18 #include "chrome/browser/chromeos/extensions/media_player_api.h"
18 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" 19 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
19 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 20 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
20 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 21 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
21 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/extensions/shell_window_registry.h" 23 #include "chrome/browser/extensions/shell_window_registry.h"
23 #include "chrome/browser/profiles/profile_manager.h" 24 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/speech/tts_controller.h" 25 #include "chrome/browser/speech/tts_controller.h"
25 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h" 26 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"
26 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 27 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
27 #include "chrome/browser/ui/ash/window_positioner.h" 28 #include "chrome/browser/ui/ash/window_positioner.h"
28 #include "chrome/browser/ui/browser.h" 29 #include "chrome/browser/ui/browser.h"
29 #include "chrome/browser/ui/browser_finder.h" 30 #include "chrome/browser/ui/browser_finder.h"
30 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/extensions/application_launch.h" 32 #include "chrome/browser/ui/extensions/application_launch.h"
32 #include "chrome/browser/ui/extensions/native_app_window.h"
33 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" 33 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "chrome/common/url_constants.h" 36 #include "chrome/common/url_constants.h"
37 #include "chromeos/chromeos_switches.h" 37 #include "chromeos/chromeos_switches.h"
38 #include "chromeos/dbus/dbus_thread_manager.h" 38 #include "chromeos/dbus/dbus_thread_manager.h"
39 #include "chromeos/dbus/power_manager_client.h" 39 #include "chromeos/dbus/power_manager_client.h"
40 #include "chromeos/ime/input_method_manager.h" 40 #include "chromeos/ime/input_method_manager.h"
41 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
42 #include "content/public/browser/user_metrics.h" 42 #include "content/public/browser/user_metrics.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 250 }
251 251
252 void ChromeShellDelegate::PlatformInit() { 252 void ChromeShellDelegate::PlatformInit() {
253 registrar_.Add(this, 253 registrar_.Add(this,
254 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 254 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
255 content::NotificationService::AllSources()); 255 content::NotificationService::AllSources());
256 registrar_.Add(this, 256 registrar_.Add(this,
257 chrome::NOTIFICATION_SESSION_STARTED, 257 chrome::NOTIFICATION_SESSION_STARTED,
258 content::NotificationService::AllSources()); 258 content::NotificationService::AllSources());
259 } 259 }
OLDNEW
« apps/shell_window.h ('K') | « chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698