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

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: 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 } 1353 }
1354 1354
1355 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) { 1355 void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
1356 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged", 1356 web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged",
1357 base::FundamentalValue(managed)); 1357 base::FundamentalValue(managed));
1358 } 1358 }
1359 #endif 1359 #endif
1360 1360
1361 scoped_ptr<base::DictionaryValue> 1361 scoped_ptr<base::DictionaryValue>
1362 BrowserOptionsHandler::GetSyncStateDictionary() { 1362 BrowserOptionsHandler::GetSyncStateDictionary() {
1363 // The items which are to be written into |sync_status| are also described in
1364 // chrome/browser/resources/options/browser_options.js in @typedef
1365 // for SyncStatus. Please update it whenever you add or remove any keys here.
1363 scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue); 1366 scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue);
1364 Profile* profile = Profile::FromWebUI(web_ui()); 1367 Profile* profile = Profile::FromWebUI(web_ui());
1365 if (profile->IsGuestSession()) { 1368 if (profile->IsGuestSession()) {
1366 // Cannot display signin status when running in guest mode on chromeos 1369 // Cannot display signin status when running in guest mode on chromeos
1367 // because there is no SigninManager. 1370 // because there is no SigninManager.
1368 sync_status->SetBoolean("signinAllowed", false); 1371 sync_status->SetBoolean("signinAllowed", false);
1369 return sync_status.Pass(); 1372 return sync_status.Pass();
1370 } 1373 }
1371 1374
1372 sync_status->SetBoolean("supervisedUser", profile->IsSupervised()); 1375 sync_status->SetBoolean("supervisedUser", profile->IsSupervised());
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 extension = extensions::GetExtensionOverridingProxy( 1884 extension = extensions::GetExtensionOverridingProxy(
1882 Profile::FromWebUI(web_ui())); 1885 Profile::FromWebUI(web_ui()));
1883 AppendExtensionData("proxy", extension, &extension_controlled); 1886 AppendExtensionData("proxy", extension, &extension_controlled);
1884 1887
1885 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1888 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1886 extension_controlled); 1889 extension_controlled);
1887 #endif // defined(OS_WIN) 1890 #endif // defined(OS_WIN)
1888 } 1891 }
1889 1892
1890 } // namespace options 1893 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698