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

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

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Cleanup. Created 4 years, 2 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 #include "ui/base/webui/web_ui_util.h" 110 #include "ui/base/webui/web_ui_util.h"
111 111
112 #if !defined(OS_CHROMEOS) 112 #if !defined(OS_CHROMEOS)
113 #include "chrome/browser/ui/startup/default_browser_prompt.h" 113 #include "chrome/browser/ui/startup/default_browser_prompt.h"
114 #include "chrome/browser/ui/webui/settings_utils.h" 114 #include "chrome/browser/ui/webui/settings_utils.h"
115 #endif 115 #endif
116 116
117 #if defined(OS_CHROMEOS) 117 #if defined(OS_CHROMEOS)
118 #include "ash/common/accessibility_types.h" // nogncheck 118 #include "ash/common/accessibility_types.h" // nogncheck
119 #include "ash/common/system/chromeos/devicetype_utils.h" // nogncheck 119 #include "ash/common/system/chromeos/devicetype_utils.h" // nogncheck
120 #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"
129 #include "chrome/browser/chromeos/profiles/profile_helper.h" 128 #include "chrome/browser/chromeos/profiles/profile_helper.h"
130 #include "chrome/browser/chromeos/reset/metrics.h" 129 #include "chrome/browser/chromeos/reset/metrics.h"
(...skipping 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after
1887 } 1886 }
1888 1887
1889 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators( 1888 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
1890 const base::ListValue* args) { 1889 const base::ListValue* args) {
1891 SetupExtensionControlledIndicators(); 1890 SetupExtensionControlledIndicators();
1892 } 1891 }
1893 1892
1894 #if defined(OS_CHROMEOS) 1893 #if defined(OS_CHROMEOS)
1895 void BrowserOptionsHandler::HandleOpenWallpaperManager( 1894 void BrowserOptionsHandler::HandleOpenWallpaperManager(
1896 const base::ListValue* args) { 1895 const base::ListValue* args) {
1897 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 1896 chromeos::WallpaperManager::Get()->Open();
1898 } 1897 }
1899 1898
1900 void BrowserOptionsHandler::VirtualKeyboardChangeCallback( 1899 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
1901 const base::ListValue* args) { 1900 const base::ListValue* args) {
1902 bool enabled = false; 1901 bool enabled = false;
1903 args->GetBoolean(0, &enabled); 1902 args->GetBoolean(0, &enabled);
1904 1903
1905 chromeos::accessibility::EnableVirtualKeyboard(enabled); 1904 chromeos::accessibility::EnableVirtualKeyboard(enabled);
1906 } 1905 }
1907 1906
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
2233 2232
2234 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2235 #if defined(OS_CHROMEOS) 2234 #if defined(OS_CHROMEOS)
2236 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2237 #else 2236 #else
2238 return true; 2237 return true;
2239 #endif 2238 #endif
2240 } 2239 }
2241 2240
2242 } // namespace options 2241 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698