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

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

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Sync and rebase; do *not* use mojo in classic ash. 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 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1883 } 1882 }
1884 1883
1885 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators( 1884 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
1886 const base::ListValue* args) { 1885 const base::ListValue* args) {
1887 SetupExtensionControlledIndicators(); 1886 SetupExtensionControlledIndicators();
1888 } 1887 }
1889 1888
1890 #if defined(OS_CHROMEOS) 1889 #if defined(OS_CHROMEOS)
1891 void BrowserOptionsHandler::HandleOpenWallpaperManager( 1890 void BrowserOptionsHandler::HandleOpenWallpaperManager(
1892 const base::ListValue* args) { 1891 const base::ListValue* args) {
1893 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 1892 chromeos::WallpaperManager::Get()->Open();
1894 } 1893 }
1895 1894
1896 void BrowserOptionsHandler::VirtualKeyboardChangeCallback( 1895 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
1897 const base::ListValue* args) { 1896 const base::ListValue* args) {
1898 bool enabled = false; 1897 bool enabled = false;
1899 args->GetBoolean(0, &enabled); 1898 args->GetBoolean(0, &enabled);
1900 1899
1901 chromeos::accessibility::EnableVirtualKeyboard(enabled); 1900 chromeos::accessibility::EnableVirtualKeyboard(enabled);
1902 } 1901 }
1903 1902
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
2229 2228
2230 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2231 #if defined(OS_CHROMEOS) 2230 #if defined(OS_CHROMEOS)
2232 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2233 #else 2232 #else
2234 return true; 2233 return true;
2235 #endif 2234 #endif
2236 } 2235 }
2237 2236
2238 } // namespace options 2237 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698