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

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

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 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/accelerators/magnifier_key_scroller.h" 7 #include "ash/accelerators/magnifier_key_scroller.h"
8 #include "ash/accelerators/spoken_feedback_toggler.h" 8 #include "ash/accelerators/spoken_feedback_toggler.h"
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/wm/mru_window_tracker.h" 10 #include "ash/wm/mru_window_tracker.h"
11 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/prefs/pref_service.h"
15 #include "chrome/browser/app_mode/app_mode_utils.h" 14 #include "chrome/browser/app_mode/app_mode_utils.h"
16 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 16 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
18 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
19 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 18 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
20 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 19 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
21 #include "chrome/browser/chromeos/display/display_preferences.h" 20 #include "chrome/browser/chromeos/display/display_preferences.h"
22 #include "chrome/browser/chromeos/policy/display_rotation_default_handler.h" 21 #include "chrome/browser/chromeos/policy/display_rotation_default_handler.h"
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
24 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/profiles/profile_manager.h" 24 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" 25 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
27 #include "chrome/browser/speech/tts_controller.h" 26 #include "chrome/browser/speech/tts_controller.h"
28 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" 27 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
29 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h" 28 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"
30 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 29 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
31 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" 30 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
32 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 31 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
33 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 32 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
34 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" 33 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
35 #include "chrome/browser/ui/browser.h" 34 #include "chrome/browser/ui/browser.h"
36 #include "chrome/browser/ui/browser_finder.h" 35 #include "chrome/browser/ui/browser_finder.h"
37 #include "chrome/browser/ui/browser_window.h" 36 #include "chrome/browser/ui/browser_window.h"
38 #include "chrome/grit/generated_resources.h" 37 #include "chrome/grit/generated_resources.h"
39 #include "chromeos/chromeos_switches.h" 38 #include "chromeos/chromeos_switches.h"
39 #include "components/prefs/pref_service.h"
40 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
41 #include "content/public/browser/user_metrics.h" 41 #include "content/public/browser/user_metrics.h"
42 #include "ui/aura/window.h" 42 #include "ui/aura/window.h"
43 #include "ui/base/ime/chromeos/input_method_manager.h" 43 #include "ui/base/ime/chromeos/input_method_manager.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 45
46 namespace { 46 namespace {
47 47
48 void InitAfterFirstSessionStart() { 48 void InitAfterFirstSessionStart() {
49 // Restore focus after the user session is started. It's needed because some 49 // Restore focus after the user session is started. It's needed because some
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 } 295 }
296 296
297 void ChromeShellDelegate::PlatformInit() { 297 void ChromeShellDelegate::PlatformInit() {
298 registrar_.Add(this, 298 registrar_.Add(this,
299 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 299 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
300 content::NotificationService::AllSources()); 300 content::NotificationService::AllSources());
301 registrar_.Add(this, 301 registrar_.Add(this,
302 chrome::NOTIFICATION_SESSION_STARTED, 302 chrome::NOTIFICATION_SESSION_STARTED,
303 content::NotificationService::AllSources()); 303 content::NotificationService::AllSources());
304 } 304 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698