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

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 again... 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 28 matching lines...) Expand all
56 if (profile_->IsSupervised()) 55 if (profile_->IsSupervised())
57 NOTREACHED(); 56 NOTREACHED();
58 else 57 else
59 ThemeServiceFactory::GetForProfile(profile_)->UseSystemTheme(); 58 ThemeServiceFactory::GetForProfile(profile_)->UseSystemTheme();
60 } 59 }
61 #endif 60 #endif
62 61
63 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
64 void AppearanceHandler::HandleOpenWallpaperManager( 63 void AppearanceHandler::HandleOpenWallpaperManager(
65 const base::ListValue* /*args*/) { 64 const base::ListValue* /*args*/) {
66 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 65 chromeos::WallpaperManager::Get()->Open();
67 } 66 }
68 #endif 67 #endif
69 68
70 } // namespace settings 69 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | components/arc/intent_helper/arc_intent_helper_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698