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

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

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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
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 "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "ash/content_support/gpu_support_impl.h" 9 #include "ash/content_support/gpu_support_impl.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 22 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
23 #include "chrome/browser/ui/browser_commands.h" 23 #include "chrome/browser/ui/browser_commands.h"
24 #include "components/signin/core/common/profile_management_switches.h" 24 #include "components/signin/core/common/profile_management_switches.h"
25 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 28
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 30 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
31 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 31 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
32 #include "chrome/browser/chromeos/login/user_manager.h" 32 #include "chrome/browser/chromeos/login/users/user_manager.h"
33 #endif 33 #endif
34 34
35 // static 35 // static
36 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 36 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
37 37
38 ChromeShellDelegate::ChromeShellDelegate() 38 ChromeShellDelegate::ChromeShellDelegate()
39 : shelf_delegate_(NULL) { 39 : shelf_delegate_(NULL) {
40 instance_ = this; 40 instance_ = this;
41 PlatformInit(); 41 PlatformInit();
42 } 42 }
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 162 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
163 ash::VirtualKeyboardStateObserver* observer) { 163 ash::VirtualKeyboardStateObserver* observer) {
164 keyboard_state_observer_list_.AddObserver(observer); 164 keyboard_state_observer_list_.AddObserver(observer);
165 } 165 }
166 166
167 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 167 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
168 ash::VirtualKeyboardStateObserver* observer) { 168 ash::VirtualKeyboardStateObserver* observer) {
169 keyboard_state_observer_list_.RemoveObserver(observer); 169 keyboard_state_observer_list_.RemoveObserver(observer);
170 } 170 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698