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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
13 #include "chrome/browser/app_mode/app_mode_utils.h" 13 #include "chrome/browser/app_mode/app_mode_utils.h"
14 #include "chrome/browser/lifetime/application_lifetime.h" 14 #include "chrome/browser/lifetime/application_lifetime.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/profiles/profiles_state.h" 16 #include "chrome/browser/profiles/profiles_state.h"
17 #include "chrome/browser/ui/app_list/app_list_service.h" 17 #include "chrome/browser/ui/app_list/app_list_service.h"
18 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 18 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
19 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" 19 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
20 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" 20 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
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 "chrome/grit/chromium_strings.h"
24 #include "components/signin/core/common/profile_management_switches.h" 25 #include "components/signin/core/common/profile_management_switches.h"
25 #include "grit/chromium_strings.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 29 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
30 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 30 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
31 #include "components/user_manager/user_manager.h" 31 #include "components/user_manager/user_manager.h"
32 #endif 32 #endif
33 33
34 // static 34 // static
35 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 35 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
(...skipping 125 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

Powered by Google App Engine
This is Rietveld 408576698