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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 327793005: Change google_util::AppendGoogleLocaleParam to take in the application locale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ChromeOS fix Created 6 years, 6 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/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/app_window.h" 9 #include "apps/app_window.h"
10 #include "apps/app_window_registry.h" 10 #include "apps/app_window_registry.h"
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 void ExtensionSettingsHandler::GetLocalizedValues( 420 void ExtensionSettingsHandler::GetLocalizedValues(
421 content::WebUIDataSource* source) { 421 content::WebUIDataSource* source) {
422 source->AddString("extensionSettings", 422 source->AddString("extensionSettings",
423 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE)); 423 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE));
424 424
425 source->AddString("extensionSettingsDeveloperMode", 425 source->AddString("extensionSettingsDeveloperMode",
426 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEVELOPER_MODE_LINK)); 426 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEVELOPER_MODE_LINK));
427 source->AddString("extensionSettingsNoExtensions", 427 source->AddString("extensionSettingsNoExtensions",
428 l10n_util::GetStringUTF16(IDS_EXTENSIONS_NONE_INSTALLED)); 428 l10n_util::GetStringUTF16(IDS_EXTENSIONS_NONE_INSTALLED));
429 source->AddString("extensionSettingsSuggestGallery", 429 source->AddString(
430 l10n_util::GetStringFUTF16(IDS_EXTENSIONS_NONE_INSTALLED_SUGGEST_GALLERY, 430 "extensionSettingsSuggestGallery",
431 base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 431 l10n_util::GetStringFUTF16(
432 GURL(extension_urls::GetExtensionGalleryURL())).spec()))); 432 IDS_EXTENSIONS_NONE_INSTALLED_SUGGEST_GALLERY,
433 base::ASCIIToUTF16(
434 google_util::AppendGoogleLocaleParam(
435 GURL(extension_urls::GetExtensionGalleryURL()),
436 g_browser_process->GetApplicationLocale()).spec())));
433 source->AddString("extensionSettingsGetMoreExtensions", 437 source->AddString("extensionSettingsGetMoreExtensions",
434 l10n_util::GetStringUTF16(IDS_GET_MORE_EXTENSIONS)); 438 l10n_util::GetStringUTF16(IDS_GET_MORE_EXTENSIONS));
435 source->AddString("extensionSettingsGetMoreExtensionsUrl", 439 source->AddString("extensionSettingsGetMoreExtensionsUrl",
436 base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 440 base::ASCIIToUTF16(
437 GURL(extension_urls::GetExtensionGalleryURL())).spec())); 441 google_util::AppendGoogleLocaleParam(
442 GURL(extension_urls::GetExtensionGalleryURL()),
443 g_browser_process->GetApplicationLocale()).spec()));
438 source->AddString("extensionSettingsExtensionId", 444 source->AddString("extensionSettingsExtensionId",
439 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID)); 445 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID));
440 source->AddString("extensionSettingsExtensionPath", 446 source->AddString("extensionSettingsExtensionPath",
441 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PATH)); 447 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PATH));
442 source->AddString("extensionSettingsInspectViews", 448 source->AddString("extensionSettingsInspectViews",
443 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSPECT_VIEWS)); 449 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSPECT_VIEWS));
444 source->AddString("extensionSettingsInstallWarnings", 450 source->AddString("extensionSettingsInstallWarnings",
445 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALL_WARNINGS)); 451 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALL_WARNINGS));
446 source->AddString("viewIncognito", 452 source->AddString("viewIncognito",
447 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INCOGNITO)); 453 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INCOGNITO));
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 source->AddString("extensionSettingsCorruptInstall", 492 source->AddString("extensionSettingsCorruptInstall",
487 l10n_util::GetStringUTF16( 493 l10n_util::GetStringUTF16(
488 IDS_EXTENSIONS_CORRUPTED_EXTENSION)); 494 IDS_EXTENSIONS_CORRUPTED_EXTENSION));
489 source->AddString("extensionSettingsSuspiciousInstall", 495 source->AddString("extensionSettingsSuspiciousInstall",
490 l10n_util::GetStringFUTF16( 496 l10n_util::GetStringFUTF16(
491 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE, 497 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE,
492 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE))); 498 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));
493 source->AddString("extensionSettingsLearnMore", 499 source->AddString("extensionSettingsLearnMore",
494 l10n_util::GetStringUTF16(IDS_LEARN_MORE)); 500 l10n_util::GetStringUTF16(IDS_LEARN_MORE));
495 source->AddString("extensionSettingsCorruptInstallHelpUrl", 501 source->AddString("extensionSettingsCorruptInstallHelpUrl",
496 base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 502 base::ASCIIToUTF16(
497 GURL(chrome::kCorruptExtensionURL)).spec())); 503 google_util::AppendGoogleLocaleParam(
504 GURL(chrome::kCorruptExtensionURL),
505 g_browser_process->GetApplicationLocale()).spec()));
498 source->AddString("extensionSettingsSuspiciousInstallHelpUrl", 506 source->AddString("extensionSettingsSuspiciousInstallHelpUrl",
499 base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 507 base::ASCIIToUTF16(
500 GURL(chrome::kRemoveNonCWSExtensionURL)).spec())); 508 google_util::AppendGoogleLocaleParam(
509 GURL(chrome::kRemoveNonCWSExtensionURL),
510 g_browser_process->GetApplicationLocale()).spec()));
501 source->AddString("extensionSettingsShowButton", 511 source->AddString("extensionSettingsShowButton",
502 l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON)); 512 l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON));
503 source->AddString("extensionSettingsLoadUnpackedButton", 513 source->AddString("extensionSettingsLoadUnpackedButton",
504 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_UNPACKED_BUTTON)); 514 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_UNPACKED_BUTTON));
505 source->AddString("extensionSettingsPackButton", 515 source->AddString("extensionSettingsPackButton",
506 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PACK_BUTTON)); 516 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PACK_BUTTON));
507 source->AddString("extensionSettingsCommandsLink", 517 source->AddString("extensionSettingsCommandsLink",
508 l10n_util::GetStringUTF16(IDS_EXTENSIONS_COMMANDS_CONFIGURE)); 518 l10n_util::GetStringUTF16(IDS_EXTENSIONS_COMMANDS_CONFIGURE));
509 source->AddString("extensionSettingsUpdateButton", 519 source->AddString("extensionSettingsUpdateButton",
510 l10n_util::GetStringUTF16(IDS_EXTENSIONS_UPDATE_BUTTON)); 520 l10n_util::GetStringUTF16(IDS_EXTENSIONS_UPDATE_BUTTON));
511 source->AddString( 521 source->AddString(
512 "extensionSettingsAppsDevToolsPromoHTML", 522 "extensionSettingsAppsDevToolsPromoHTML",
513 l10n_util::GetStringFUTF16( 523 l10n_util::GetStringFUTF16(
514 IDS_EXTENSIONS_APPS_DEV_TOOLS_PROMO_HTML, 524 IDS_EXTENSIONS_APPS_DEV_TOOLS_PROMO_HTML,
515 base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 525 base::ASCIIToUTF16(
516 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + 526 google_util::AppendGoogleLocaleParam(
517 kAppsDeveloperToolsExtensionId)).spec()))); 527 GURL(extension_urls::GetWebstoreItemDetailURLPrefix() +
528 kAppsDeveloperToolsExtensionId),
529 g_browser_process->GetApplicationLocale()).spec())));
518 source->AddString( 530 source->AddString(
519 "extensionSettingsAppDevToolsPromoClose", 531 "extensionSettingsAppDevToolsPromoClose",
520 l10n_util::GetStringUTF16(IDS_CLOSE)); 532 l10n_util::GetStringUTF16(IDS_CLOSE));
521 source->AddString("extensionSettingsCrashMessage", 533 source->AddString("extensionSettingsCrashMessage",
522 l10n_util::GetStringUTF16(IDS_EXTENSIONS_CRASHED_EXTENSION)); 534 l10n_util::GetStringUTF16(IDS_EXTENSIONS_CRASHED_EXTENSION));
523 source->AddString("extensionSettingsInDevelopment", 535 source->AddString("extensionSettingsInDevelopment",
524 l10n_util::GetStringUTF16(IDS_EXTENSIONS_IN_DEVELOPMENT)); 536 l10n_util::GetStringUTF16(IDS_EXTENSIONS_IN_DEVELOPMENT));
525 source->AddString("extensionSettingsWarningsTitle", 537 source->AddString("extensionSettingsWarningsTitle",
526 l10n_util::GetStringUTF16(IDS_EXTENSION_WARNINGS_TITLE)); 538 l10n_util::GetStringUTF16(IDS_EXTENSION_WARNINGS_TITLE));
527 source->AddString("extensionSettingsShowDetails", 539 source->AddString("extensionSettingsShowDetails",
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 extension_service_->EnableExtension(extension_id); 1344 extension_service_->EnableExtension(extension_id);
1333 } else { 1345 } else {
1334 ExtensionErrorReporter::GetInstance()->ReportError( 1346 ExtensionErrorReporter::GetInstance()->ReportError(
1335 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1347 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1336 true); // Be noisy. 1348 true); // Be noisy.
1337 } 1349 }
1338 requirements_checker_.reset(); 1350 requirements_checker_.reset();
1339 } 1351 }
1340 1352
1341 } // namespace extensions 1353 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_util.cc ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698