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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state.cc ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/host/root_window_host_factory.h" 8 #include "ash/host/root_window_host_factory.h"
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
11 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
12 #include "ash/wm/window_properties.h" 12 #include "ash/wm/window_properties.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/prefs/pref_service.h"
16 #include "chrome/browser/app_mode/app_mode_utils.h" 17 #include "chrome/browser/app_mode/app_mode_utils.h"
17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 18 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
18 #include "chrome/browser/chromeos/login/screen_locker.h" 19 #include "chrome/browser/chromeos/login/screen_locker.h"
19 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 20 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
20 #include "chrome/browser/lifetime/application_lifetime.h" 21 #include "chrome/browser/lifetime/application_lifetime.h"
21 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/browser/sessions/tab_restore_service.h" 23 #include "chrome/browser/sessions/tab_restore_service.h"
24 #include "chrome/browser/sessions/tab_restore_service_factory.h" 24 #include "chrome/browser/sessions/tab_restore_service_factory.h"
25 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 25 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
26 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" 26 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
27 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 27 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
28 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 28 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
29 #include "chrome/browser/ui/ash/user_action_handler.h" 29 #include "chrome/browser/ui/ash/user_action_handler.h"
30 #include "chrome/browser/ui/ash/window_positioner.h" 30 #include "chrome/browser/ui/ash/window_positioner.h"
31 #include "chrome/browser/ui/browser.h" 31 #include "chrome/browser/ui/browser.h"
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 ash::Shell::GetInstance()->ShowLauncher(); 608 ash::Shell::GetInstance()->ShowLauncher();
609 break; 609 break;
610 default: 610 default:
611 NOTREACHED() << "Unexpected notification " << type; 611 NOTREACHED() << "Unexpected notification " << type;
612 } 612 }
613 #else 613 #else
614 // MSVC++ warns about switch statements without any cases. 614 // MSVC++ warns about switch statements without any cases.
615 NOTREACHED() << "Unexpected notification " << type; 615 NOTREACHED() << "Unexpected notification " << type;
616 #endif 616 #endif
617 } 617 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state.cc ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698