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

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

Issue 593273002: Excludes settings which uses Ash from Athena. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years, 3 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 4af7dda304d8210edb1788f4cc73abbabd97e667..6fe42dea43464b81c3cbf8c82b5681ec0bdeae9a 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1360,6 +1360,11 @@ void BrowserOptionsHandler::OnAccountPictureManagedChanged(bool managed) {
}
void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
+#if defined(USE_ATHENA)
+ // In Athena, we don't allow customizing wallpaper right now.
+ // TODO(mukai|bshe): remove this. http://crbug.com/408734
+ managed = true;
+#endif
web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged",
base::FundamentalValue(managed));
}

Powered by Google App Engine
This is Rietveld 408576698