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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 email_value); 1353 email_value);
1354 } 1354 }
1355 } 1355 }
1356 1356
1357 void BrowserOptionsHandler::OnAccountPictureManagedChanged(bool managed) { 1357 void BrowserOptionsHandler::OnAccountPictureManagedChanged(bool managed) {
1358 web_ui()->CallJavascriptFunction("BrowserOptions.setAccountPictureManaged", 1358 web_ui()->CallJavascriptFunction("BrowserOptions.setAccountPictureManaged",
1359 base::FundamentalValue(managed)); 1359 base::FundamentalValue(managed));
1360 } 1360 }
1361 1361
1362 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) { 1362 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
1363 #if defined(USE_ATHENA)
1364 // In Athena, we don't allow customizing wallpaper right now.
1365 // TODO(mukai|bshe): remove this. http://crbug.com/408734
1366 managed = true;
1367 #endif
1363 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged", 1368 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged",
1364 base::FundamentalValue(managed)); 1369 base::FundamentalValue(managed));
1365 } 1370 }
1366 #endif 1371 #endif
1367 1372
1368 scoped_ptr<base::DictionaryValue> 1373 scoped_ptr<base::DictionaryValue>
1369 BrowserOptionsHandler::GetSyncStateDictionary() { 1374 BrowserOptionsHandler::GetSyncStateDictionary() {
1370 // The items which are to be written into |sync_status| are also described in 1375 // The items which are to be written into |sync_status| are also described in
1371 // chrome/browser/resources/options/browser_options.js in @typedef 1376 // chrome/browser/resources/options/browser_options.js in @typedef
1372 // for SyncStatus. Please update it whenever you add or remove any keys here. 1377 // for SyncStatus. Please update it whenever you add or remove any keys here.
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1925 1930
1926 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked, 1931 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
1927 bool disabled) { 1932 bool disabled) {
1928 web_ui()->CallJavascriptFunction( 1933 web_ui()->CallJavascriptFunction(
1929 "BrowserOptions.setMetricsReportingCheckboxState", 1934 "BrowserOptions.setMetricsReportingCheckboxState",
1930 base::FundamentalValue(checked), 1935 base::FundamentalValue(checked),
1931 base::FundamentalValue(disabled)); 1936 base::FundamentalValue(disabled));
1932 } 1937 }
1933 1938
1934 } // namespace options 1939 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698