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

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

Issue 10990021: Factory reset dialog string change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | 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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 377
378 #if defined(OS_CHROMEOS) 378 #if defined(OS_CHROMEOS)
379 values->SetString("username", 379 values->SetString("username",
380 chromeos::UserManager::Get()->IsUserLoggedIn() ? 380 chromeos::UserManager::Get()->IsUserLoggedIn() ?
381 chromeos::UserManager::Get()->GetLoggedInUser().email() : 381 chromeos::UserManager::Get()->GetLoggedInUser().email() :
382 std::string()); 382 std::string());
383 383
384 values->SetString( 384 values->SetString(
385 "factoryResetDescription", 385 "factoryResetDescription",
386 l10n_util::GetStringFUTF16( 386 l10n_util::GetStringFUTF16(
387 IDS_OPTIONS_FACTORY_RESET_DESCRIPTION, 387 IDS_OPTIONS_FACTORY_RESET_WARNING,
Nikita (slow) 2012/09/25 12:00:08 It seems that you have 2 strings that are the same
glotov 2012/09/25 12:07:39 Done.
388 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); 388 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
389 #endif 389 #endif
390 390
391 // Pass along sync status early so it will be available during page init. 391 // Pass along sync status early so it will be available during page init.
392 values->Set("syncData", GetSyncStateDictionary().release()); 392 values->Set("syncData", GetSyncStateDictionary().release());
393 393
394 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL); 394 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
395 values->SetString("sessionRestoreLearnMoreURL", 395 values->SetString("sessionRestoreLearnMoreURL",
396 chrome::kSessionRestoreLearnMoreURL); 396 chrome::kSessionRestoreLearnMoreURL);
397 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL); 397 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 } 1503 }
1504 1504
1505 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1505 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1506 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1506 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1507 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1507 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1508 web_ui()->CallJavascriptFunction( 1508 web_ui()->CallJavascriptFunction(
1509 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1509 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1510 } 1510 }
1511 1511
1512 } // namespace options 1512 } // namespace options
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698