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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 559423003: Compile chrome://settings, part 7. 33 errors left (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@H_options_errors_5
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/resources/options/website_settings.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 } 1360 }
1361 1361
1362 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) { 1362 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
1363 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged", 1363 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged",
1364 base::FundamentalValue(managed)); 1364 base::FundamentalValue(managed));
1365 } 1365 }
1366 #endif 1366 #endif
1367 1367
1368 scoped_ptr<base::DictionaryValue> 1368 scoped_ptr<base::DictionaryValue>
1369 BrowserOptionsHandler::GetSyncStateDictionary() { 1369 BrowserOptionsHandler::GetSyncStateDictionary() {
1370 // The items which are to be written into |sync_status| are also described in
1371 // chrome/browser/resources/options/browser_options.js in @typedef
1372 // for SyncStatus. Please update it whenever you add or remove any keys here.
1370 scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue); 1373 scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue);
1371 Profile* profile = Profile::FromWebUI(web_ui()); 1374 Profile* profile = Profile::FromWebUI(web_ui());
1372 if (profile->IsGuestSession()) { 1375 if (profile->IsGuestSession()) {
1373 // Cannot display signin status when running in guest mode on chromeos 1376 // Cannot display signin status when running in guest mode on chromeos
1374 // because there is no SigninManager. 1377 // because there is no SigninManager.
1375 sync_status->SetBoolean("signinAllowed", false); 1378 sync_status->SetBoolean("signinAllowed", false);
1376 return sync_status.Pass(); 1379 return sync_status.Pass();
1377 } 1380 }
1378 1381
1379 sync_status->SetBoolean("supervisedUser", profile->IsSupervised()); 1382 sync_status->SetBoolean("supervisedUser", profile->IsSupervised());
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1922 1925
1923 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked, 1926 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
1924 bool disabled) { 1927 bool disabled) {
1925 web_ui()->CallJavascriptFunction( 1928 web_ui()->CallJavascriptFunction(
1926 "BrowserOptions.setMetricsReportingCheckboxState", 1929 "BrowserOptions.setMetricsReportingCheckboxState",
1927 base::FundamentalValue(checked), 1930 base::FundamentalValue(checked),
1928 base::FundamentalValue(disabled)); 1931 base::FundamentalValue(disabled));
1929 } 1932 }
1930 1933
1931 } // namespace options 1934 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/website_settings.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698