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

Side by Side Diff: chrome/browser/ui/webui/settings/appearance_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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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/settings/appearance_handler.h" 5 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/themes/theme_service.h" 11 #include "chrome/browser/themes/theme_service.h"
12 #include "chrome/browser/themes/theme_service_factory.h" 12 #include "chrome/browser/themes/theme_service_factory.h"
13 #include "content/public/browser/web_ui.h" 13 #include "content/public/browser/web_ui.h"
14 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 #include "ash/common/wallpaper/wallpaper_delegate.h" // nogncheck 16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
17 #include "ash/common/wm_shell.h" // nogncheck
18 #endif 17 #endif
19 18
20 namespace settings { 19 namespace settings {
21 20
22 AppearanceHandler::AppearanceHandler(content::WebUI* webui) 21 AppearanceHandler::AppearanceHandler(content::WebUI* webui)
23 : profile_(Profile::FromWebUI(webui)) { 22 : profile_(Profile::FromWebUI(webui)) {
24 } 23 }
25 24
26 AppearanceHandler::~AppearanceHandler() {} 25 AppearanceHandler::~AppearanceHandler() {}
27 26
(...skipping 25 matching lines...) Expand all
53 52
54 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 53 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
55 void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) { 54 void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
56 ThemeServiceFactory::GetForProfile(profile_)->UseSystemTheme(); 55 ThemeServiceFactory::GetForProfile(profile_)->UseSystemTheme();
57 } 56 }
58 #endif 57 #endif
59 58
60 #if defined(OS_CHROMEOS) 59 #if defined(OS_CHROMEOS)
61 void AppearanceHandler::HandleOpenWallpaperManager( 60 void AppearanceHandler::HandleOpenWallpaperManager(
62 const base::ListValue* /*args*/) { 61 const base::ListValue* /*args*/) {
63 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 62 chromeos::WallpaperManager::Get()->Open();
64 } 63 }
65 #endif 64 #endif
66 65
67 } // namespace settings 66 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698