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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc

Issue 1991083002: Remove ExtensionFunction::SetResult(T*) overload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/extensions/file_manager/private_api_strings.h" 5 #include "chrome/browser/chromeos/extensions/file_manager/private_api_strings.h"
6 6
7 #include <memory>
8 #include <utility>
9
7 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
8 #include "base/sys_info.h" 11 #include "base/sys_info.h"
9 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/file_manager/open_with_browser.h" 13 #include "chrome/browser/chromeos/file_manager/open_with_browser.h"
11 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
12 #include "chromeos/system/statistics_provider.h" 15 #include "chromeos/system/statistics_provider.h"
13 #include "extensions/common/extension_l10n_util.h" 16 #include "extensions/common/extension_l10n_util.h"
14 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/webui/web_ui_util.h" 18 #include "ui/base/webui/web_ui_util.h"
16 #include "ui/strings/grit/app_locale_settings.h" 19 #include "ui/strings/grit/app_locale_settings.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 339
337 namespace extensions { 340 namespace extensions {
338 341
339 FileManagerPrivateGetStringsFunction::FileManagerPrivateGetStringsFunction() { 342 FileManagerPrivateGetStringsFunction::FileManagerPrivateGetStringsFunction() {
340 } 343 }
341 344
342 FileManagerPrivateGetStringsFunction::~FileManagerPrivateGetStringsFunction() { 345 FileManagerPrivateGetStringsFunction::~FileManagerPrivateGetStringsFunction() {
343 } 346 }
344 347
345 bool FileManagerPrivateGetStringsFunction::RunSync() { 348 bool FileManagerPrivateGetStringsFunction::RunSync() {
346 base::DictionaryValue* dict = new base::DictionaryValue(); 349 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
347 SetResult(dict);
348 350
349 AddStringsForDrive(dict); 351 AddStringsForDrive(dict.get());
350 AddStringsForFileTypes(dict); 352 AddStringsForFileTypes(dict.get());
351 AddStringsForGallery(dict); 353 AddStringsForGallery(dict.get());
352 AddStringsForMediaPlayer(dict); 354 AddStringsForMediaPlayer(dict.get());
353 AddStringsForVideoPlayer(dict); 355 AddStringsForVideoPlayer(dict.get());
354 AddStringsForAudioPlayer(dict); 356 AddStringsForAudioPlayer(dict.get());
355 AddStringsForCloudImport(dict); 357 AddStringsForCloudImport(dict.get());
356 AddStringsForCrUiMenuItemShortcuts(dict); 358 AddStringsForCrUiMenuItemShortcuts(dict.get());
357 AddStringsForFileErrors(dict); 359 AddStringsForFileErrors(dict.get());
358 360
359 SET_STRING("ADD_NEW_SERVICES_BUTTON_LABEL", 361 SET_STRING("ADD_NEW_SERVICES_BUTTON_LABEL",
360 IDS_FILE_BROWSER_ADD_NEW_SERVICES_BUTTON_LABEL); 362 IDS_FILE_BROWSER_ADD_NEW_SERVICES_BUTTON_LABEL);
361 SET_STRING("ALL_FILES_FILTER", IDS_FILE_BROWSER_ALL_FILES_FILTER); 363 SET_STRING("ALL_FILES_FILTER", IDS_FILE_BROWSER_ALL_FILES_FILTER);
362 SET_STRING("ARCHIVE_MOUNT_FAILED", IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED); 364 SET_STRING("ARCHIVE_MOUNT_FAILED", IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED);
363 SET_STRING("CALCULATING_SIZE", IDS_FILE_BROWSER_CALCULATING_SIZE); 365 SET_STRING("CALCULATING_SIZE", IDS_FILE_BROWSER_CALCULATING_SIZE);
364 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL); 366 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL);
365 SET_STRING("CHANGE_DEFAULT_CAPTION", IDS_FILE_BROWSER_CHANGE_DEFAULT_CAPTION); 367 SET_STRING("CHANGE_DEFAULT_CAPTION", IDS_FILE_BROWSER_CHANGE_DEFAULT_CAPTION);
366 SET_STRING("CHANGE_DEFAULT_MENU_ITEM", 368 SET_STRING("CHANGE_DEFAULT_MENU_ITEM",
367 IDS_FILE_BROWSER_CHANGE_DEFAULT_MENU_ITEM); 369 IDS_FILE_BROWSER_CHANGE_DEFAULT_MENU_ITEM);
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 dict->SetString("GOOGLE_DRIVE_HELP_URL", kGoogleDriveHelpUrl); 637 dict->SetString("GOOGLE_DRIVE_HELP_URL", kGoogleDriveHelpUrl);
636 dict->SetString("GOOGLE_DRIVE_OVERVIEW_URL", kGoogleDriveOverviewUrl); 638 dict->SetString("GOOGLE_DRIVE_OVERVIEW_URL", kGoogleDriveOverviewUrl);
637 dict->SetString("GOOGLE_DRIVE_REDEEM_URL", kGoogleDriveRedeemUrl); 639 dict->SetString("GOOGLE_DRIVE_REDEEM_URL", kGoogleDriveRedeemUrl);
638 dict->SetString("GOOGLE_DRIVE_ROOT_URL", kGoogleDriveRootUrl); 640 dict->SetString("GOOGLE_DRIVE_ROOT_URL", kGoogleDriveRootUrl);
639 dict->SetString( 641 dict->SetString(
640 "NO_TASK_FOR_FILE_URL", 642 "NO_TASK_FOR_FILE_URL",
641 base::StringPrintf(kHelpURLFormat, kNoActionForFileHelpNumber)); 643 base::StringPrintf(kHelpURLFormat, kNoActionForFileHelpNumber));
642 dict->SetString("UI_LOCALE", extension_l10n_util::CurrentLocaleOrDefault()); 644 dict->SetString("UI_LOCALE", extension_l10n_util::CurrentLocaleOrDefault());
643 645
644 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 646 const std::string& app_locale = g_browser_process->GetApplicationLocale();
645 webui::SetLoadTimeDataDefaults(app_locale, dict); 647 webui::SetLoadTimeDataDefaults(app_locale, dict.get());
648 SetResult(std::move(dict));
646 649
647 return true; 650 return true;
648 } 651 }
649 652
650 } // namespace extensions 653 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698