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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 4f821f098a48e817f0f307e87f2b1f3dea528d31..364d48af9ad7bdf58b28636e65b90dde3d1e1a96 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -117,7 +117,7 @@
#include "ash/common/accessibility_types.h"
#include "ash/common/ash_switches.h"
#include "ash/common/system/chromeos/devicetype_utils.h"
-#include "ash/desktop_background/user_wallpaper_delegate.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/shell.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
@@ -149,7 +149,7 @@
#endif
#if defined(USE_ASH)
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#endif
using base::UserMetricsAction;
@@ -662,7 +662,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
// Profile deletion is not allowed for any users using Metro mode.
bool allow_deletion = true;
#if defined(USE_ASH)
- allow_deletion = allow_deletion && !ash::Shell::HasInstance();
+ allow_deletion = allow_deletion && !ash::WmShell::HasInstance();
#endif
values->SetBoolean("allowProfileDeletion", allow_deletion);
@@ -1893,7 +1893,7 @@ void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
#if defined(OS_CHROMEOS)
void BrowserOptionsHandler::HandleOpenWallpaperManager(
const base::ListValue* args) {
- ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();
+ ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();
}
void BrowserOptionsHandler::VirtualKeyboardChangeCallback(

Powered by Google App Engine
This is Rietveld 408576698