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

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

Issue 14691004: [sync] Separate sign in from sync on Desktop Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 387 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
388 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE }, 388 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
389 #endif 389 #endif
390 #if !defined(OS_CHROMEOS) 390 #if !defined(OS_CHROMEOS)
391 { "gpuModeCheckbox", 391 { "gpuModeCheckbox",
392 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE }, 392 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE },
393 { "gpuModeResetRestart", 393 { "gpuModeResetRestart",
394 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART }, 394 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART },
395 // Strings with product-name substitutions. 395 // Strings with product-name substitutions.
396 { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME }, 396 { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME },
397 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL, 397 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
398 { "syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
398 IDS_SHORT_PRODUCT_NAME }, 399 IDS_SHORT_PRODUCT_NAME },
399 #endif 400 #endif
400 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, 401 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
401 IDS_PRODUCT_NAME }, 402 IDS_PRODUCT_NAME },
402 { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, 403 { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
403 IDS_PRODUCT_NAME }, 404 IDS_PRODUCT_NAME },
404 { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT, 405 { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
405 IDS_PRODUCT_NAME }, 406 IDS_PRODUCT_NAME },
406 { "autoLaunchText", IDS_AUTOLAUNCH_TEXT, IDS_PRODUCT_NAME }, 407 { "autoLaunchText", IDS_AUTOLAUNCH_TEXT, IDS_PRODUCT_NAME },
407 #if defined(OS_CHROMEOS) 408 #if defined(OS_CHROMEOS)
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1544 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1544 is_extension_controlled); 1545 is_extension_controlled);
1545 base::FundamentalValue extension_controlled(is_extension_controlled); 1546 base::FundamentalValue extension_controlled(is_extension_controlled);
1546 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1547 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1547 disabled, extension_controlled); 1548 disabled, extension_controlled);
1548 1549
1549 #endif // !defined(OS_CHROMEOS) 1550 #endif // !defined(OS_CHROMEOS)
1550 } 1551 }
1551 1552
1552 } // namespace options 1553 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698