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

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

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 base::DictionaryValue* app_values = NULL; 502 base::DictionaryValue* app_values = NULL;
503 CHECK(values->GetDictionary(kSettingsAppKey, &app_values)); 503 CHECK(values->GetDictionary(kSettingsAppKey, &app_values));
504 RegisterStrings(app_values, app_resources, arraysize(app_resources)); 504 RegisterStrings(app_values, app_resources, arraysize(app_resources));
505 #endif 505 #endif
506 506
507 RegisterStrings(values, resources, arraysize(resources)); 507 RegisterStrings(values, resources, arraysize(resources));
508 RegisterTitle(values, "doNotTrackConfirmOverlay", 508 RegisterTitle(values, "doNotTrackConfirmOverlay",
509 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE); 509 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
510 RegisterTitle(values, "spellingConfirmOverlay", 510 RegisterTitle(values, "spellingConfirmOverlay",
511 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE); 511 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE);
512 #if defined(ENABLE_FULL_PRINTING) 512 #if defined(ENABLE_PRINT_PREVIEW)
513 RegisterCloudPrintValues(values); 513 RegisterCloudPrintValues(values);
514 #endif 514 #endif
515 515
516 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); 516 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
517 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL); 517 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
518 values->SetString( 518 values->SetString(
519 "defaultSearchGroupLabel", 519 "defaultSearchGroupLabel",
520 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url)); 520 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url));
521 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL); 521 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL);
522 RegisterTitle(values, "hotwordConfirmOverlay", 522 RegisterTitle(values, "hotwordConfirmOverlay",
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 638
639 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); 639 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
640 640
641 values->SetBoolean("websiteSettingsManagerEnabled", 641 values->SetBoolean("websiteSettingsManagerEnabled",
642 CommandLine::ForCurrentProcess()->HasSwitch( 642 CommandLine::ForCurrentProcess()->HasSwitch(
643 switches::kEnableWebsiteSettingsManager)); 643 switches::kEnableWebsiteSettingsManager));
644 644
645 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); 645 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
646 } 646 }
647 647
648 #if defined(ENABLE_FULL_PRINTING) 648 #if defined(ENABLE_PRINT_PREVIEW)
649 void BrowserOptionsHandler::RegisterCloudPrintValues( 649 void BrowserOptionsHandler::RegisterCloudPrintValues(
650 base::DictionaryValue* values) { 650 base::DictionaryValue* values) {
651 values->SetString("cloudPrintOptionLabel", 651 values->SetString("cloudPrintOptionLabel",
652 l10n_util::GetStringFUTF16( 652 l10n_util::GetStringFUTF16(
653 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 653 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
654 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 654 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
655 } 655 }
656 #endif // defined(ENABLE_FULL_PRINTING) 656 #endif // defined(ENABLE_PRINT_PREVIEW)
657 657
658 void BrowserOptionsHandler::RegisterMessages() { 658 void BrowserOptionsHandler::RegisterMessages() {
659 web_ui()->RegisterMessageCallback( 659 web_ui()->RegisterMessageCallback(
660 "becomeDefaultBrowser", 660 "becomeDefaultBrowser",
661 base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser, 661 base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser,
662 base::Unretained(this))); 662 base::Unretained(this)));
663 web_ui()->RegisterMessageCallback( 663 web_ui()->RegisterMessageCallback(
664 "setDefaultSearchEngine", 664 "setDefaultSearchEngine",
665 base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine, 665 base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine,
666 base::Unretained(this))); 666 base::Unretained(this)));
(...skipping 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1989 1989
1990 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked, 1990 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
1991 bool disabled) { 1991 bool disabled) {
1992 web_ui()->CallJavascriptFunction( 1992 web_ui()->CallJavascriptFunction(
1993 "BrowserOptions.setMetricsReportingCheckboxState", 1993 "BrowserOptions.setMetricsReportingCheckboxState",
1994 base::FundamentalValue(checked), 1994 base::FundamentalValue(checked),
1995 base::FundamentalValue(disabled)); 1995 base::FundamentalValue(disabled));
1996 } 1996 }
1997 1997
1998 } // namespace options 1998 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698