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

Side by Side Diff: chrome/browser/ui/webui/settings/appearance_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) 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/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/browser/themes/theme_service_factory.h" 13 #include "chrome/browser/themes/theme_service_factory.h"
14 #include "content/public/browser/notification_source.h" 14 #include "content/public/browser/notification_source.h"
15 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "ash/common/wallpaper/wallpaper_delegate.h" // nogncheck 18 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
19 #include "ash/common/wm_shell.h" // nogncheck
20 #endif 19 #endif
21 20
22 namespace settings { 21 namespace settings {
23 22
24 AppearanceHandler::AppearanceHandler(content::WebUI* webui) 23 AppearanceHandler::AppearanceHandler(content::WebUI* webui)
25 : profile_(Profile::FromWebUI(webui)) { 24 : profile_(Profile::FromWebUI(webui)) {
26 } 25 }
27 26
28 AppearanceHandler::~AppearanceHandler() {} 27 AppearanceHandler::~AppearanceHandler() {}
29 28
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 CHECK_EQ(1U, args->GetSize()); 79 CHECK_EQ(1U, args->GetSize());
81 const base::Value* callback_id; 80 const base::Value* callback_id;
82 CHECK(args->Get(0, &callback_id)); 81 CHECK(args->Get(0, &callback_id));
83 ResolveJavascriptCallback(*callback_id, 82 ResolveJavascriptCallback(*callback_id,
84 base::FundamentalValue(ResetThemeEnabled())); 83 base::FundamentalValue(ResetThemeEnabled()));
85 } 84 }
86 85
87 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
88 void AppearanceHandler::HandleOpenWallpaperManager( 87 void AppearanceHandler::HandleOpenWallpaperManager(
89 const base::ListValue* /*args*/) { 88 const base::ListValue* /*args*/) {
90 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 89 chromeos::WallpaperManager::Get()->Open();
91 } 90 }
92 #endif 91 #endif
93 92
94 } // namespace settings 93 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698