| OLD | NEW |
| 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/desktop_background/user_wallpaper_delegate.h" | 18 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 19 #include "ash/shell.h" | 19 #include "ash/common/wm_shell.h" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 namespace settings { | 22 namespace settings { |
| 23 | 23 |
| 24 AppearanceHandler::AppearanceHandler(content::WebUI* webui) | 24 AppearanceHandler::AppearanceHandler(content::WebUI* webui) |
| 25 : profile_(Profile::FromWebUI(webui)) { | 25 : profile_(Profile::FromWebUI(webui)) { |
| 26 } | 26 } |
| 27 | 27 |
| 28 AppearanceHandler::~AppearanceHandler() {} | 28 AppearanceHandler::~AppearanceHandler() {} |
| 29 | 29 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 CHECK_EQ(1U, args->GetSize()); | 80 CHECK_EQ(1U, args->GetSize()); |
| 81 const base::Value* callback_id; | 81 const base::Value* callback_id; |
| 82 CHECK(args->Get(0, &callback_id)); | 82 CHECK(args->Get(0, &callback_id)); |
| 83 ResolveJavascriptCallback(*callback_id, | 83 ResolveJavascriptCallback(*callback_id, |
| 84 base::FundamentalValue(ResetThemeEnabled())); | 84 base::FundamentalValue(ResetThemeEnabled())); |
| 85 } | 85 } |
| 86 | 86 |
| 87 #if defined(OS_CHROMEOS) | 87 #if defined(OS_CHROMEOS) |
| 88 void AppearanceHandler::HandleOpenWallpaperManager( | 88 void AppearanceHandler::HandleOpenWallpaperManager( |
| 89 const base::ListValue* /*args*/) { | 89 const base::ListValue* /*args*/) { |
| 90 ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage(); | 90 ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); |
| 91 } | 91 } |
| 92 #endif | 92 #endif |
| 93 | 93 |
| 94 } // namespace settings | 94 } // namespace settings |
| OLD | NEW |