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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.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 (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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/content/gpu_support_impl.h" 9 #include "ash/content/gpu_support_impl.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/browser_finder.h" 25 #include "chrome/browser/ui/browser_finder.h"
26 #include "chrome/browser/ui/browser_navigator.h" 26 #include "chrome/browser/ui/browser_navigator.h"
27 #include "chrome/browser/ui/browser_navigator_params.h" 27 #include "chrome/browser/ui/browser_navigator_params.h"
28 #include "chrome/browser/ui/browser_window.h" 28 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/grit/chromium_strings.h" 29 #include "chrome/grit/chromium_strings.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
33 33
34 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
35 #include "base/prefs/pref_service.h"
36 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 35 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
37 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 36 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
38 #include "chrome/browser/chromeos/profiles/profile_helper.h" 37 #include "chrome/browser/chromeos/profiles/profile_helper.h"
39 #include "chrome/browser/chromeos/system/input_device_settings.h" 38 #include "chrome/browser/chromeos/system/input_device_settings.h"
40 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
41 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
41 #include "components/prefs/pref_service.h"
42 #include "components/user_manager/user.h" 42 #include "components/user_manager/user.h"
43 #include "components/user_manager/user_manager.h" 43 #include "components/user_manager/user_manager.h"
44 #endif 44 #endif
45 45
46 namespace { 46 namespace {
47 47
48 const char kKeyboardShortcutHelpPageUrl[] = 48 const char kKeyboardShortcutHelpPageUrl[] =
49 "https://support.google.com/chromebook/answer/183101"; 49 "https://support.google.com/chromebook/answer/183101";
50 50
51 } // namespace 51 } // namespace
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 214 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
215 ash::VirtualKeyboardStateObserver* observer) { 215 ash::VirtualKeyboardStateObserver* observer) {
216 keyboard_state_observer_list_.AddObserver(observer); 216 keyboard_state_observer_list_.AddObserver(observer);
217 } 217 }
218 218
219 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 219 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
220 ash::VirtualKeyboardStateObserver* observer) { 220 ash::VirtualKeyboardStateObserver* observer) {
221 keyboard_state_observer_list_.RemoveObserver(observer); 221 keyboard_state_observer_list_.RemoveObserver(observer);
222 } 222 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_screenshot_grabber.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698