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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #include "third_party/skia/include/core/SkBitmap.h" 111 #include "third_party/skia/include/core/SkBitmap.h"
112 #include "ui/base/l10n/l10n_util.h" 112 #include "ui/base/l10n/l10n_util.h"
113 #include "ui/base/webui/web_ui_util.h" 113 #include "ui/base/webui/web_ui_util.h"
114 114
115 #if !defined(OS_CHROMEOS) 115 #if !defined(OS_CHROMEOS)
116 #include "chrome/browser/ui/startup/default_browser_prompt.h" 116 #include "chrome/browser/ui/startup/default_browser_prompt.h"
117 #include "chrome/browser/ui/webui/settings_utils.h" 117 #include "chrome/browser/ui/webui/settings_utils.h"
118 #endif 118 #endif
119 119
120 #if defined(OS_CHROMEOS) 120 #if defined(OS_CHROMEOS)
121 #include "ash/common/accessibility_types.h" // nogncheck 121 #include "ash/accessibility_types.h" // nogncheck
122 #include "ash/shell.h" // nogncheck 122 #include "ash/shell.h" // nogncheck
123 #include "ash/system/devicetype_utils.h" // nogncheck 123 #include "ash/system/devicetype_utils.h" // nogncheck
124 #include "chrome/browser/browser_process_platform_part.h" 124 #include "chrome/browser/browser_process_platform_part.h"
125 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 125 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
126 #include "chrome/browser/chromeos/arc/arc_util.h" 126 #include "chrome/browser/chromeos/arc/arc_util.h"
127 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 127 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
128 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 128 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
129 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" 129 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
130 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 130 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
131 #include "chrome/browser/chromeos/profiles/profile_helper.h" 131 #include "chrome/browser/chromeos/profiles/profile_helper.h"
(...skipping 12 matching lines...) Expand all
144 #include "components/user_manager/user.h" 144 #include "components/user_manager/user.h"
145 #include "components/user_manager/user_manager.h" 145 #include "components/user_manager/user_manager.h"
146 #include "ui/gfx/image/image_skia.h" 146 #include "ui/gfx/image/image_skia.h"
147 #endif // defined(OS_CHROMEOS) 147 #endif // defined(OS_CHROMEOS)
148 148
149 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 149 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
150 #include "chrome/browser/printing/cloud_print/privet_notifications.h" 150 #include "chrome/browser/printing/cloud_print/privet_notifications.h"
151 #endif 151 #endif
152 152
153 #if defined(USE_ASH) 153 #if defined(USE_ASH)
154 #include "ash/common/wm_shell.h" // nogncheck 154 #include "ash/wm_shell.h" // nogncheck
155 #endif 155 #endif
156 156
157 using base::UserMetricsAction; 157 using base::UserMetricsAction;
158 using content::BrowserContext; 158 using content::BrowserContext;
159 using content::BrowserThread; 159 using content::BrowserThread;
160 using content::DownloadManager; 160 using content::DownloadManager;
161 using content::OpenURLParams; 161 using content::OpenURLParams;
162 using content::Referrer; 162 using content::Referrer;
163 using extensions::Extension; 163 using extensions::Extension;
164 using extensions::ExtensionRegistry; 164 using extensions::ExtensionRegistry;
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 2354
2355 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2355 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2356 #if defined(OS_CHROMEOS) 2356 #if defined(OS_CHROMEOS)
2357 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2357 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2358 #else 2358 #else
2359 return true; 2359 return true;
2360 #endif 2360 #endif
2361 } 2361 }
2362 2362
2363 } // namespace options 2363 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698