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

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

Issue 10990052: Removing the "learn more" link for session restore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 2 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
« no previous file with comments | « chrome/browser/resources/options/startup_section.html ('k') | chrome/common/url_constants.h » ('j') | 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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 "factoryResetDescription", 391 "factoryResetDescription",
392 l10n_util::GetStringFUTF16( 392 l10n_util::GetStringFUTF16(
393 IDS_OPTIONS_FACTORY_RESET_DESCRIPTION, 393 IDS_OPTIONS_FACTORY_RESET_DESCRIPTION,
394 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); 394 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
395 #endif 395 #endif
396 396
397 // Pass along sync status early so it will be available during page init. 397 // Pass along sync status early so it will be available during page init.
398 values->Set("syncData", GetSyncStateDictionary().release()); 398 values->Set("syncData", GetSyncStateDictionary().release());
399 399
400 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL); 400 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
401 values->SetString("sessionRestoreLearnMoreURL",
402 chrome::kSessionRestoreLearnMoreURL);
403 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL); 401 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
404 402
405 values->SetString( 403 values->SetString(
406 "languageSectionLabel", 404 "languageSectionLabel",
407 l10n_util::GetStringFUTF16( 405 l10n_util::GetStringFUTF16(
408 IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL, 406 IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
409 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); 407 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
410 408
411 #if defined(OS_CHROMEOS) 409 #if defined(OS_CHROMEOS)
412 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL); 410 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL);
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 } 1507 }
1510 1508
1511 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1509 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1512 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1510 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1513 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1511 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1514 web_ui()->CallJavascriptFunction( 1512 web_ui()->CallJavascriptFunction(
1515 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1513 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1516 } 1514 }
1517 1515
1518 } // namespace options 1516 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/startup_section.html ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698