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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "third_party/skia/include/core/SkBitmap.h" 104 #include "third_party/skia/include/core/SkBitmap.h"
105 #include "ui/base/l10n/l10n_util.h" 105 #include "ui/base/l10n/l10n_util.h"
106 #include "ui/base/webui/web_ui_util.h" 106 #include "ui/base/webui/web_ui_util.h"
107 107
108 #if !defined(OS_CHROMEOS) 108 #if !defined(OS_CHROMEOS)
109 #include "chrome/browser/ui/startup/default_browser_prompt.h" 109 #include "chrome/browser/ui/startup/default_browser_prompt.h"
110 #include "chrome/browser/ui/webui/settings_utils.h" 110 #include "chrome/browser/ui/webui/settings_utils.h"
111 #endif 111 #endif
112 112
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "ash/ash_switches.h" 114 #include "ash/common/ash_switches.h"
115 #include "ash/common/system/chromeos/devicetype_utils.h" 115 #include "ash/common/system/chromeos/devicetype_utils.h"
116 #include "ash/desktop_background/user_wallpaper_delegate.h" 116 #include "ash/desktop_background/user_wallpaper_delegate.h"
117 #include "ash/shell.h" 117 #include "ash/shell.h"
118 #include "chrome/browser/browser_process_platform_part.h" 118 #include "chrome/browser/browser_process_platform_part.h"
119 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 119 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
120 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 120 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
121 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 121 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
122 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" 122 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
123 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 123 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
124 #include "chrome/browser/chromeos/profiles/profile_helper.h" 124 #include "chrome/browser/chromeos/profiles/profile_helper.h"
(...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 2228
2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2230 #if defined(OS_CHROMEOS) 2230 #if defined(OS_CHROMEOS)
2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2232 #else 2232 #else
2233 return true; 2233 return true;
2234 #endif 2234 #endif
2235 } 2235 }
2236 2236
2237 } // namespace options 2237 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698