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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 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
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/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "ui/base/l10n/l10n_util.h" 108 #include "ui/base/l10n/l10n_util.h"
109 #include "ui/base/webui/web_ui_util.h" 109 #include "ui/base/webui/web_ui_util.h"
110 110
111 #if !defined(OS_CHROMEOS) 111 #if !defined(OS_CHROMEOS)
112 #include "chrome/browser/ui/startup/default_browser_prompt.h" 112 #include "chrome/browser/ui/startup/default_browser_prompt.h"
113 #include "chrome/browser/ui/webui/settings_utils.h" 113 #include "chrome/browser/ui/webui/settings_utils.h"
114 #endif 114 #endif
115 115
116 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
117 #include "ash/common/accessibility_types.h" // nogncheck 117 #include "ash/common/accessibility_types.h" // nogncheck
118 #include "ash/common/ash_switches.h" // nogncheck
119 #include "ash/common/system/chromeos/devicetype_utils.h" // nogncheck 118 #include "ash/common/system/chromeos/devicetype_utils.h" // nogncheck
120 #include "ash/common/wallpaper/wallpaper_delegate.h" // nogncheck 119 #include "ash/common/wallpaper/wallpaper_delegate.h" // nogncheck
121 #include "ash/shell.h" // nogncheck 120 #include "ash/shell.h" // nogncheck
122 #include "chrome/browser/browser_process_platform_part.h" 121 #include "chrome/browser/browser_process_platform_part.h"
123 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 122 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
124 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 123 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
125 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 124 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
126 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 125 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
127 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" 126 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
128 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 127 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
(...skipping 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after
2238 2237
2239 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2238 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2240 #if defined(OS_CHROMEOS) 2239 #if defined(OS_CHROMEOS)
2241 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2240 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2242 #else 2241 #else
2243 return true; 2242 return true;
2244 #endif 2243 #endif
2245 } 2244 }
2246 2245
2247 } // namespace options 2246 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698