diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 05:20:08 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 05:20:08 +0000 |
| commit | 533ef3d365c29ff78439edc6acf7e0ba3803bf26 (patch) | |
| tree | 5d6e30a217673dea7fb649fb7af5c76c46a44033 /chrome/browser/extensions | |
| parent | ac9142eab1d80e2e8da9c827772ac6157e35d804 (diff) | |
| download | chromium_src-533ef3d365c29ff78439edc6acf7e0ba3803bf26.zip chromium_src-533ef3d365c29ff78439edc6acf7e0ba3803bf26.tar.gz chromium_src-533ef3d365c29ff78439edc6acf7e0ba3803bf26.tar.bz2 | |
Rename (Chrome)SyncExtensionFunction::RunImpl to RunSync so that the RunImpl
function doesn't require divergent return value semantics depending on subclass.
BUG=365732
R=rockot@chromium.org
TBR=pkasting@chromium.org,dtseng@chromium.org
Review URL: https://codereview.chromium.org/252653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
109 files changed, 526 insertions, 552 deletions
diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc index 03acdfc..52fe000 100644 --- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc +++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc @@ -117,7 +117,7 @@ BoundsType GetBoundsType(const std::string& type_as_string) { } // namespace bounds -bool AppCurrentWindowInternalExtensionFunction::RunImpl() { +bool AppCurrentWindowInternalExtensionFunction::RunSync() { apps::AppWindowRegistry* registry = apps::AppWindowRegistry::Get(GetProfile()); DCHECK(registry); diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h index d4d688a..1af11ff 100644 --- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h +++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h @@ -22,7 +22,7 @@ class AppCurrentWindowInternalExtensionFunction virtual bool RunWithWindow(apps::AppWindow* window) = 0; private: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AppCurrentWindowInternalFocusFunction diff --git a/chrome/browser/extensions/api/audio/audio_api.cc b/chrome/browser/extensions/api/audio/audio_api.cc index 70e849f..06285f0 100644 --- a/chrome/browser/extensions/api/audio/audio_api.cc +++ b/chrome/browser/extensions/api/audio/audio_api.cc @@ -65,7 +65,7 @@ void AudioGetInfoFunction::OnGetInfoCompleted(const OutputInfo& output_info, SendResponse(success); } -bool AudioSetActiveDevicesFunction::RunImpl() { +bool AudioSetActiveDevicesFunction::RunSync() { scoped_ptr<api::audio::SetActiveDevices::Params> params( api::audio::SetActiveDevices::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -78,7 +78,7 @@ bool AudioSetActiveDevicesFunction::RunImpl() { return true; } -bool AudioSetPropertiesFunction::RunImpl() { +bool AudioSetPropertiesFunction::RunSync() { scoped_ptr<api::audio::SetProperties::Params> params( api::audio::SetProperties::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/audio/audio_api.h b/chrome/browser/extensions/api/audio/audio_api.h index a612f8b..f99547a 100644 --- a/chrome/browser/extensions/api/audio/audio_api.h +++ b/chrome/browser/extensions/api/audio/audio_api.h @@ -60,7 +60,7 @@ class AudioSetActiveDevicesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetActiveDevicesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { @@ -70,7 +70,7 @@ class AudioSetPropertiesFunction : public ChromeSyncExtensionFunction { protected: virtual ~AudioSetPropertiesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc index c8a00b9..fdc9ca5 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc @@ -66,21 +66,21 @@ bool IsTestMode(Profile* profile) { } // namespace -bool AutotestPrivateLogoutFunction::RunImpl() { +bool AutotestPrivateLogoutFunction::RunSync() { DVLOG(1) << "AutotestPrivateLogoutFunction"; if (!IsTestMode(GetProfile())) chrome::AttemptUserExit(); return true; } -bool AutotestPrivateRestartFunction::RunImpl() { +bool AutotestPrivateRestartFunction::RunSync() { DVLOG(1) << "AutotestPrivateRestartFunction"; if (!IsTestMode(GetProfile())) chrome::AttemptRestart(); return true; } -bool AutotestPrivateShutdownFunction::RunImpl() { +bool AutotestPrivateShutdownFunction::RunSync() { scoped_ptr<api::autotest_private::Shutdown::Params> params( api::autotest_private::Shutdown::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -92,7 +92,7 @@ bool AutotestPrivateShutdownFunction::RunImpl() { return true; } -bool AutotestPrivateLoginStatusFunction::RunImpl() { +bool AutotestPrivateLoginStatusFunction::RunSync() { DVLOG(1) << "AutotestPrivateLoginStatusFunction"; base::DictionaryValue* result(new base::DictionaryValue); @@ -138,7 +138,7 @@ bool AutotestPrivateLoginStatusFunction::RunImpl() { return true; } -bool AutotestPrivateLockScreenFunction::RunImpl() { +bool AutotestPrivateLockScreenFunction::RunSync() { DVLOG(1) << "AutotestPrivateLockScreenFunction"; #if defined(OS_CHROMEOS) chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> @@ -147,7 +147,7 @@ bool AutotestPrivateLockScreenFunction::RunImpl() { return true; } -bool AutotestPrivateGetExtensionsInfoFunction::RunImpl() { +bool AutotestPrivateGetExtensionsInfoFunction::RunSync() { DVLOG(1) << "AutotestPrivateGetExtensionsInfoFunction"; ExtensionService* service = extensions::ExtensionSystem::Get( @@ -212,7 +212,7 @@ static int AccessArray(const volatile int arr[], const volatile int *index) { return arr[*index]; } -bool AutotestPrivateSimulateAsanMemoryBugFunction::RunImpl() { +bool AutotestPrivateSimulateAsanMemoryBugFunction::RunSync() { DVLOG(1) << "AutotestPrivateSimulateAsanMemoryBugFunction"; if (!IsTestMode(GetProfile())) { // This array is volatile not to let compiler optimize us out. diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h index 213b9d7..daa94d9 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h @@ -19,7 +19,7 @@ class AutotestPrivateLogoutFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLogoutFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateRestartFunction : public ChromeSyncExtensionFunction { @@ -28,7 +28,7 @@ class AutotestPrivateRestartFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateRestartFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateShutdownFunction : public ChromeSyncExtensionFunction { @@ -38,7 +38,7 @@ class AutotestPrivateShutdownFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateShutdownFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateLoginStatusFunction : public ChromeSyncExtensionFunction { @@ -48,7 +48,7 @@ class AutotestPrivateLoginStatusFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLoginStatusFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateLockScreenFunction : public ChromeSyncExtensionFunction { @@ -58,7 +58,7 @@ class AutotestPrivateLockScreenFunction : public ChromeSyncExtensionFunction { private: virtual ~AutotestPrivateLockScreenFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateGetExtensionsInfoFunction @@ -69,7 +69,7 @@ class AutotestPrivateGetExtensionsInfoFunction private: virtual ~AutotestPrivateGetExtensionsInfoFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class AutotestPrivateSimulateAsanMemoryBugFunction @@ -80,7 +80,7 @@ class AutotestPrivateSimulateAsanMemoryBugFunction private: virtual ~AutotestPrivateSimulateAsanMemoryBugFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // Don't kill the browser when we're in a browser test. diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc index 0a67615..52c631e 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc @@ -483,7 +483,7 @@ void BluetoothAddProfileFunction::OnProfileRegistered( BluetoothRemoveProfileFunction::~BluetoothRemoveProfileFunction() {} -bool BluetoothRemoveProfileFunction::RunImpl() { +bool BluetoothRemoveProfileFunction::RunSync() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); scoped_ptr<RemoveProfile::Params> params( RemoveProfile::Params::Create(*args_)); diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h index 45d69d8..8cfa295 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h @@ -201,7 +201,7 @@ class BluetoothRemoveProfileFunction : public SyncExtensionFunction { protected: virtual ~BluetoothRemoveProfileFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class BluetoothConnectFunction : public BluetoothExtensionFunction { diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 095a1c9..91f2fa6 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -357,13 +357,13 @@ bool ClipboardBookmarkManagerFunction::CopyOrCut(bool cut, return true; } -bool BookmarkManagerPrivateCopyFunction::RunImpl() { +bool BookmarkManagerPrivateCopyFunction::RunOnReady() { scoped_ptr<Copy::Params> params(Copy::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); return CopyOrCut(false, params->id_list); } -bool BookmarkManagerPrivateCutFunction::RunImpl() { +bool BookmarkManagerPrivateCutFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -372,7 +372,7 @@ bool BookmarkManagerPrivateCutFunction::RunImpl() { return CopyOrCut(true, params->id_list); } -bool BookmarkManagerPrivatePasteFunction::RunImpl() { +bool BookmarkManagerPrivatePasteFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -405,7 +405,7 @@ bool BookmarkManagerPrivatePasteFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateCanPasteFunction::RunImpl() { +bool BookmarkManagerPrivateCanPasteFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -423,7 +423,7 @@ bool BookmarkManagerPrivateCanPasteFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateSortChildrenFunction::RunImpl() { +bool BookmarkManagerPrivateSortChildrenFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -519,7 +519,7 @@ bool BookmarkManagerPrivateGetStringsFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateStartDragFunction::RunImpl() { +bool BookmarkManagerPrivateStartDragFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -553,7 +553,7 @@ bool BookmarkManagerPrivateStartDragFunction::RunImpl() { } } -bool BookmarkManagerPrivateDropFunction::RunImpl() { +bool BookmarkManagerPrivateDropFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -602,7 +602,7 @@ bool BookmarkManagerPrivateDropFunction::RunImpl() { } } -bool BookmarkManagerPrivateGetSubtreeFunction::RunImpl() { +bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() { scoped_ptr<GetSubtree::Params> params(GetSubtree::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -626,19 +626,19 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateCanEditFunction::RunImpl() { +bool BookmarkManagerPrivateCanEditFunction::RunOnReady() { PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile()); SetResult(new base::FundamentalValue( prefs->GetBoolean(prefs::kEditBookmarksEnabled))); return true; } -bool BookmarkManagerPrivateRecordLaunchFunction::RunImpl() { +bool BookmarkManagerPrivateRecordLaunchFunction::RunOnReady() { RecordBookmarkLaunch(NULL, BOOKMARK_LAUNCH_LOCATION_MANAGER); return true; } -bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunImpl() { +bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunOnReady() { scoped_ptr<CreateWithMetaInfo::Params> params( CreateWithMetaInfo::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -656,7 +656,7 @@ bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateGetMetaInfoFunction::RunImpl() { +bool BookmarkManagerPrivateGetMetaInfoFunction::RunOnReady() { scoped_ptr<GetMetaInfo::Params> params(GetMetaInfo::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -685,7 +685,7 @@ bool BookmarkManagerPrivateGetMetaInfoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateSetMetaInfoFunction::RunImpl() { +bool BookmarkManagerPrivateSetMetaInfoFunction::RunOnReady() { scoped_ptr<SetMetaInfo::Params> params(SetMetaInfo::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -698,7 +698,7 @@ bool BookmarkManagerPrivateSetMetaInfoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateUpdateMetaInfoFunction::RunImpl() { +bool BookmarkManagerPrivateUpdateMetaInfoFunction::RunOnReady() { scoped_ptr<UpdateMetaInfo::Params> params( UpdateMetaInfo::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -719,13 +719,13 @@ bool BookmarkManagerPrivateUpdateMetaInfoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateCanOpenNewWindowsFunction::RunImpl() { +bool BookmarkManagerPrivateCanOpenNewWindowsFunction::RunOnReady() { bool can_open_new_windows = true; SetResult(new base::FundamentalValue(can_open_new_windows)); return true; } -bool BookmarkManagerPrivateRemoveTreesFunction::RunImpl() { +bool BookmarkManagerPrivateRemoveTreesFunction::RunOnReady() { scoped_ptr<RemoveTrees::Params> params(RemoveTrees::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -744,7 +744,7 @@ bool BookmarkManagerPrivateRemoveTreesFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateUndoFunction::RunImpl() { +bool BookmarkManagerPrivateUndoFunction::RunOnReady() { #if !defined(OS_ANDROID) BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager()-> Undo(); @@ -753,7 +753,7 @@ bool BookmarkManagerPrivateUndoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateRedoFunction::RunImpl() { +bool BookmarkManagerPrivateRedoFunction::RunOnReady() { #if !defined(OS_ANDROID) BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager()-> Redo(); @@ -762,7 +762,7 @@ bool BookmarkManagerPrivateRedoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateGetUndoInfoFunction::RunImpl() { +bool BookmarkManagerPrivateGetUndoInfoFunction::RunOnReady() { #if !defined(OS_ANDROID) UndoManager* undo_manager = BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager(); @@ -777,7 +777,7 @@ bool BookmarkManagerPrivateGetUndoInfoFunction::RunImpl() { return true; } -bool BookmarkManagerPrivateGetRedoInfoFunction::RunImpl() { +bool BookmarkManagerPrivateGetRedoInfoFunction::RunOnReady() { #if !defined(OS_ANDROID) UndoManager* undo_manager = BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager(); diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h index 5dfda53..e5f1007 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h @@ -133,7 +133,7 @@ class BookmarkManagerPrivateCopyFunction virtual ~BookmarkManagerPrivateCopyFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateCutFunction @@ -146,7 +146,7 @@ class BookmarkManagerPrivateCutFunction virtual ~BookmarkManagerPrivateCutFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivatePasteFunction @@ -159,7 +159,7 @@ class BookmarkManagerPrivatePasteFunction virtual ~BookmarkManagerPrivatePasteFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateCanPasteFunction @@ -172,7 +172,7 @@ class BookmarkManagerPrivateCanPasteFunction virtual ~BookmarkManagerPrivateCanPasteFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateSortChildrenFunction @@ -185,7 +185,7 @@ class BookmarkManagerPrivateSortChildrenFunction virtual ~BookmarkManagerPrivateSortChildrenFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateGetStringsFunction : public AsyncExtensionFunction { @@ -210,7 +210,7 @@ class BookmarkManagerPrivateStartDragFunction virtual ~BookmarkManagerPrivateStartDragFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateDropFunction @@ -223,7 +223,7 @@ class BookmarkManagerPrivateDropFunction virtual ~BookmarkManagerPrivateDropFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateGetSubtreeFunction @@ -236,7 +236,7 @@ class BookmarkManagerPrivateGetSubtreeFunction virtual ~BookmarkManagerPrivateGetSubtreeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateCanEditFunction @@ -249,7 +249,7 @@ class BookmarkManagerPrivateCanEditFunction virtual ~BookmarkManagerPrivateCanEditFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateRecordLaunchFunction @@ -262,7 +262,7 @@ class BookmarkManagerPrivateRecordLaunchFunction virtual ~BookmarkManagerPrivateRecordLaunchFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateCreateWithMetaInfoFunction @@ -275,7 +275,7 @@ class BookmarkManagerPrivateCreateWithMetaInfoFunction virtual ~BookmarkManagerPrivateCreateWithMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateGetMetaInfoFunction @@ -288,7 +288,7 @@ class BookmarkManagerPrivateGetMetaInfoFunction virtual ~BookmarkManagerPrivateGetMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateSetMetaInfoFunction @@ -301,7 +301,7 @@ class BookmarkManagerPrivateSetMetaInfoFunction virtual ~BookmarkManagerPrivateSetMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateUpdateMetaInfoFunction @@ -314,7 +314,7 @@ class BookmarkManagerPrivateUpdateMetaInfoFunction virtual ~BookmarkManagerPrivateUpdateMetaInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateCanOpenNewWindowsFunction @@ -327,7 +327,7 @@ class BookmarkManagerPrivateCanOpenNewWindowsFunction virtual ~BookmarkManagerPrivateCanOpenNewWindowsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateRemoveTreesFunction @@ -340,7 +340,7 @@ class BookmarkManagerPrivateRemoveTreesFunction virtual ~BookmarkManagerPrivateRemoveTreesFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateUndoFunction @@ -353,7 +353,7 @@ class BookmarkManagerPrivateUndoFunction virtual ~BookmarkManagerPrivateUndoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateRedoFunction @@ -366,7 +366,7 @@ class BookmarkManagerPrivateRedoFunction virtual ~BookmarkManagerPrivateRedoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateGetUndoInfoFunction @@ -379,7 +379,7 @@ class BookmarkManagerPrivateGetUndoInfoFunction virtual ~BookmarkManagerPrivateGetUndoInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; class BookmarkManagerPrivateGetRedoInfoFunction @@ -392,7 +392,7 @@ class BookmarkManagerPrivateGetRedoInfoFunction virtual ~BookmarkManagerPrivateGetRedoInfoFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunOnReady() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 7d1bb23..c780c18 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -98,16 +98,16 @@ base::FilePath GetDefaultFilepathForBookmarkExport() { } // namespace -void BookmarksFunction::Run() { +bool BookmarksFunction::RunImpl() { BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); if (!model->loaded()) { // Bookmarks are not ready yet. We'll wait. model->AddObserver(this); AddRef(); // Balanced in Loaded(). - return; + return true; } - bool success = RunImpl(); + bool success = RunOnReady(); if (success) { content::NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED, @@ -115,6 +115,7 @@ void BookmarksFunction::Run() { content::Details<const BookmarksFunction>(this)); } SendResponse(success); + return true; } bool BookmarksFunction::GetBookmarkIdAsInt64(const std::string& id_string, @@ -217,8 +218,8 @@ void BookmarksFunction::BookmarkModelChanged() { void BookmarksFunction::BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) { model->RemoveObserver(this); - Run(); - Release(); // Balanced in Run(). + RunOnReady(); + Release(); // Balanced in RunOnReady(). } BookmarkEventRouter::BookmarkEventRouter(BrowserContext* context, @@ -386,7 +387,7 @@ void BookmarksAPI::OnListenerAdded(const EventListenerInfo& details) { EventRouter::Get(browser_context_)->UnregisterObserver(this); } -bool BookmarksGetFunction::RunImpl() { +bool BookmarksGetFunction::RunOnReady() { scoped_ptr<bookmarks::Get::Params> params( bookmarks::Get::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -414,7 +415,7 @@ bool BookmarksGetFunction::RunImpl() { return true; } -bool BookmarksGetChildrenFunction::RunImpl() { +bool BookmarksGetChildrenFunction::RunOnReady() { scoped_ptr<bookmarks::GetChildren::Params> params( bookmarks::GetChildren::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -434,7 +435,7 @@ bool BookmarksGetChildrenFunction::RunImpl() { return true; } -bool BookmarksGetRecentFunction::RunImpl() { +bool BookmarksGetRecentFunction::RunOnReady() { scoped_ptr<bookmarks::GetRecent::Params> params( bookmarks::GetRecent::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -458,7 +459,7 @@ bool BookmarksGetRecentFunction::RunImpl() { return true; } -bool BookmarksGetTreeFunction::RunImpl() { +bool BookmarksGetTreeFunction::RunOnReady() { std::vector<linked_ptr<BookmarkTreeNode> > nodes; const BookmarkNode* node = BookmarkModelFactory::GetForProfile(GetProfile())->root_node(); @@ -467,7 +468,7 @@ bool BookmarksGetTreeFunction::RunImpl() { return true; } -bool BookmarksGetSubTreeFunction::RunImpl() { +bool BookmarksGetSubTreeFunction::RunOnReady() { scoped_ptr<bookmarks::GetSubTree::Params> params( bookmarks::GetSubTree::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -482,7 +483,7 @@ bool BookmarksGetSubTreeFunction::RunImpl() { return true; } -bool BookmarksSearchFunction::RunImpl() { +bool BookmarksSearchFunction::RunOnReady() { scoped_ptr<bookmarks::Search::Params> params( bookmarks::Search::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -546,7 +547,7 @@ bool BookmarksRemoveFunction::ExtractIds(const base::ListValue* args, return true; } -bool BookmarksRemoveFunction::RunImpl() { +bool BookmarksRemoveFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -569,7 +570,7 @@ bool BookmarksRemoveFunction::RunImpl() { return true; } -bool BookmarksCreateFunction::RunImpl() { +bool BookmarksCreateFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -597,7 +598,7 @@ bool BookmarksMoveFunction::ExtractIds(const base::ListValue* args, return BookmarksUpdateFunction::ExtractIds(args, ids, invalid_id); } -bool BookmarksMoveFunction::RunImpl() { +bool BookmarksMoveFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -664,7 +665,7 @@ bool BookmarksUpdateFunction::ExtractIds(const base::ListValue* args, return BookmarksRemoveFunction::ExtractIds(args, ids, invalid_id); } -bool BookmarksUpdateFunction::RunImpl() { +bool BookmarksUpdateFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; @@ -734,7 +735,7 @@ class CreateBookmarkBucketMapper : public BookmarkBucketMapper<std::string> { public: explicit CreateBookmarkBucketMapper(BrowserContext* context) : browser_context_(context) {} - // TODO(tim): This should share code with BookmarksCreateFunction::RunImpl, + // TODO(tim): This should share code with BookmarksCreateFunction::RunOnReady, // but I can't figure out a good way to do that with all the macros. virtual void GetBucketsForArgs(const base::ListValue* args, BucketList* buckets) OVERRIDE { @@ -980,7 +981,7 @@ void BookmarksIOFunction::MultiFilesSelected( NOTREACHED() << "Should not be able to select multiple files"; } -bool BookmarksImportFunction::RunImpl() { +bool BookmarksImportFunction::RunOnReady() { if (!EditBookmarksEnabled()) return false; SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE); @@ -1010,7 +1011,7 @@ void BookmarksImportFunction::FileSelected(const base::FilePath& path, Release(); // Balanced in BookmarksIOFunction::SelectFile() } -bool BookmarksExportFunction::RunImpl() { +bool BookmarksExportFunction::RunOnReady() { SelectFile(ui::SelectFileDialog::SELECT_SAVEAS_FILE); return true; } diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index 4079829..60010fb 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -114,11 +114,14 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, public BaseBookmarkModelObserver { public: // AsyncExtensionFunction: - virtual void Run() OVERRIDE; + virtual bool RunImpl() OVERRIDE; protected: virtual ~BookmarksFunction() {} + // RunImpl semantic equivalent called when the bookmarks are ready. + virtual bool RunOnReady() = 0; + // Helper to get the bookmark id as int64 from the given string id. // Sets error_ to an error string if the given id string can't be parsed // as an int64. In case of error, doesn't change id and returns false. @@ -154,8 +157,8 @@ class BookmarksGetFunction : public BookmarksFunction { protected: virtual ~BookmarksGetFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksGetChildrenFunction : public BookmarksFunction { @@ -165,8 +168,8 @@ class BookmarksGetChildrenFunction : public BookmarksFunction { protected: virtual ~BookmarksGetChildrenFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksGetRecentFunction : public BookmarksFunction { @@ -176,8 +179,8 @@ class BookmarksGetRecentFunction : public BookmarksFunction { protected: virtual ~BookmarksGetRecentFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksGetTreeFunction : public BookmarksFunction { @@ -187,8 +190,8 @@ class BookmarksGetTreeFunction : public BookmarksFunction { protected: virtual ~BookmarksGetTreeFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksGetSubTreeFunction : public BookmarksFunction { @@ -198,8 +201,8 @@ class BookmarksGetSubTreeFunction : public BookmarksFunction { protected: virtual ~BookmarksGetSubTreeFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksSearchFunction : public BookmarksFunction { @@ -209,8 +212,8 @@ class BookmarksSearchFunction : public BookmarksFunction { protected: virtual ~BookmarksSearchFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksRemoveFunction : public BookmarksFunction { @@ -222,15 +225,15 @@ class BookmarksRemoveFunction : public BookmarksFunction { static bool ExtractIds(const base::ListValue* args, std::list<int64>* ids, bool* invalid_id); - // ExtensionFunction: + // BookmarksFunction: virtual void GetQuotaLimitHeuristics( QuotaLimitHeuristics* heuristics) const OVERRIDE; protected: virtual ~BookmarksRemoveFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksRemoveTreeFunction : public BookmarksRemoveFunction { @@ -245,15 +248,15 @@ class BookmarksCreateFunction : public BookmarksFunction { public: DECLARE_EXTENSION_FUNCTION("bookmarks.create", BOOKMARKS_CREATE) - // ExtensionFunction: + // BookmarksFunction: virtual void GetQuotaLimitHeuristics( QuotaLimitHeuristics* heuristics) const OVERRIDE; protected: virtual ~BookmarksCreateFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksMoveFunction : public BookmarksFunction { @@ -264,15 +267,15 @@ class BookmarksMoveFunction : public BookmarksFunction { std::list<int64>* ids, bool* invalid_id); - // ExtensionFunction: + // BookmarksFunction: virtual void GetQuotaLimitHeuristics( QuotaLimitHeuristics* heuristics) const OVERRIDE; protected: virtual ~BookmarksMoveFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksUpdateFunction : public BookmarksFunction { @@ -283,15 +286,15 @@ class BookmarksUpdateFunction : public BookmarksFunction { std::list<int64>* ids, bool* invalid_id); - // ExtensionFunction: + // BookmarksFunction: virtual void GetQuotaLimitHeuristics( QuotaLimitHeuristics* heuristics) const OVERRIDE; protected: virtual ~BookmarksUpdateFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksIOFunction : public BookmarksFunction, @@ -332,8 +335,8 @@ class BookmarksImportFunction : public BookmarksIOFunction { private: virtual ~BookmarksImportFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; class BookmarksExportFunction : public BookmarksIOFunction { @@ -348,8 +351,8 @@ class BookmarksExportFunction : public BookmarksIOFunction { private: virtual ~BookmarksExportFunction() {} - // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + // BookmarksFunction: + virtual bool RunOnReady() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc index 3478197..3c881d3 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc @@ -112,8 +112,7 @@ bool IsRemovalPermitted(int removal_mask, PrefService* prefs) { } // namespace - -bool BrowsingDataSettingsFunction::RunImpl() { +bool BrowsingDataSettingsFunction::RunSync() { PrefService* prefs = GetProfile()->GetPrefs(); // Fill origin types. diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h index 4e1b7ce..9a5c814 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h @@ -56,7 +56,7 @@ class BrowsingDataSettingsFunction : public ChromeSyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("browsingData.settings", BROWSINGDATA_SETTINGS) // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~BrowsingDataSettingsFunction() {} diff --git a/chrome/browser/extensions/api/command_line_private/command_line_private_api.cc b/chrome/browser/extensions/api/command_line_private/command_line_private_api.cc index 04b4411..52586c5d 100644 --- a/chrome/browser/extensions/api/command_line_private/command_line_private_api.cc +++ b/chrome/browser/extensions/api/command_line_private/command_line_private_api.cc @@ -21,7 +21,7 @@ namespace extensions { namespace command_line_private = api::command_line_private; -bool CommandLinePrivateHasSwitchFunction::RunImpl() { +bool CommandLinePrivateHasSwitchFunction::RunSync() { scoped_ptr<command_line_private::HasSwitch::Params> params( command_line_private::HasSwitch::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/chrome/browser/extensions/api/command_line_private/command_line_private_api.h b/chrome/browser/extensions/api/command_line_private/command_line_private_api.h index 430f44c..bca3098 100644 --- a/chrome/browser/extensions/api/command_line_private/command_line_private_api.h +++ b/chrome/browser/extensions/api/command_line_private/command_line_private_api.h @@ -16,7 +16,7 @@ class CommandLinePrivateHasSwitchFunction : public SyncExtensionFunction { virtual ~CommandLinePrivateHasSwitchFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/commands/commands.cc b/chrome/browser/extensions/api/commands/commands.cc index 621ad55..2cc997b 100644 --- a/chrome/browser/extensions/api/commands/commands.cc +++ b/chrome/browser/extensions/api/commands/commands.cc @@ -22,7 +22,7 @@ base::DictionaryValue* CreateCommandValue( } // namespace -bool GetAllCommandsFunction::RunImpl() { +bool GetAllCommandsFunction::RunSync() { base::ListValue* command_list = new base::ListValue(); extensions::CommandService* command_service = diff --git a/chrome/browser/extensions/api/commands/commands.h b/chrome/browser/extensions/api/commands/commands.h index 26bf708..0096e93 100644 --- a/chrome/browser/extensions/api/commands/commands.h +++ b/chrome/browser/extensions/api/commands/commands.h @@ -9,7 +9,7 @@ class GetAllCommandsFunction : public ChromeSyncExtensionFunction { virtual ~GetAllCommandsFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("commands.getAll", COMMANDS_GETALL) }; diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 6fff07f..976b632 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -60,7 +60,7 @@ namespace extensions { namespace helpers = content_settings_helpers; namespace keys = content_settings_api_constants; -bool ContentSettingsContentSettingClearFunction::RunImpl() { +bool ContentSettingsContentSettingClearFunction::RunSync() { ContentSettingsType content_type; EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); @@ -94,7 +94,7 @@ bool ContentSettingsContentSettingClearFunction::RunImpl() { return true; } -bool ContentSettingsContentSettingGetFunction::RunImpl() { +bool ContentSettingsContentSettingGetFunction::RunSync() { ContentSettingsType content_type; EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); @@ -168,7 +168,7 @@ bool ContentSettingsContentSettingGetFunction::RunImpl() { return true; } -bool ContentSettingsContentSettingSetFunction::RunImpl() { +bool ContentSettingsContentSettingSetFunction::RunSync() { ContentSettingsType content_type; EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type)); diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h index b2e3beb..cd18443 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h @@ -24,7 +24,7 @@ class ContentSettingsContentSettingClearFunction virtual ~ContentSettingsContentSettingClearFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContentSettingsContentSettingGetFunction @@ -36,7 +36,7 @@ class ContentSettingsContentSettingGetFunction virtual ~ContentSettingsContentSettingGetFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContentSettingsContentSettingSetFunction @@ -48,7 +48,7 @@ class ContentSettingsContentSettingSetFunction virtual ~ContentSettingsContentSettingSetFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContentSettingsContentSettingGetResourceIdentifiersFunction diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.cc b/chrome/browser/extensions/api/context_menus/context_menus_api.cc index e9e7f76..b1cef33 100644 --- a/chrome/browser/extensions/api/context_menus/context_menus_api.cc +++ b/chrome/browser/extensions/api/context_menus/context_menus_api.cc @@ -32,7 +32,7 @@ namespace Create = api::context_menus::Create; namespace Remove = api::context_menus::Remove; namespace Update = api::context_menus::Update; -bool ContextMenusCreateFunction::RunImpl() { +bool ContextMenusCreateFunction::RunSync() { MenuItem::Id id(GetProfile()->IsOffTheRecord(), MenuItem::ExtensionKey(extension_id())); scoped_ptr<Create::Params> params(Create::Params::Create(*args_)); @@ -57,7 +57,7 @@ bool ContextMenusCreateFunction::RunImpl() { GetExtension(), id, &error_); } -bool ContextMenusUpdateFunction::RunImpl() { +bool ContextMenusUpdateFunction::RunSync() { MenuItem::Id item_id(GetProfile()->IsOffTheRecord(), MenuItem::ExtensionKey(extension_id())); scoped_ptr<Update::Params> params(Update::Params::Create(*args_)); @@ -74,7 +74,7 @@ bool ContextMenusUpdateFunction::RunImpl() { GetExtension(), item_id, &error_); } -bool ContextMenusRemoveFunction::RunImpl() { +bool ContextMenusRemoveFunction::RunSync() { scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -103,7 +103,7 @@ bool ContextMenusRemoveFunction::RunImpl() { return true; } -bool ContextMenusRemoveAllFunction::RunImpl() { +bool ContextMenusRemoveAllFunction::RunSync() { MenuManager* manager = MenuManager::Get(GetProfile()); manager->RemoveAllContextItems(MenuItem::ExtensionKey(GetExtension()->id())); manager->WriteToStorage(GetExtension(), diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.h b/chrome/browser/extensions/api/context_menus/context_menus_api.h index 2e05f26..d2097ff 100644 --- a/chrome/browser/extensions/api/context_menus/context_menus_api.h +++ b/chrome/browser/extensions/api/context_menus/context_menus_api.h @@ -17,7 +17,7 @@ class ContextMenusCreateFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusCreateFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContextMenusUpdateFunction : public ChromeSyncExtensionFunction { @@ -28,7 +28,7 @@ class ContextMenusUpdateFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusUpdateFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContextMenusRemoveFunction : public ChromeSyncExtensionFunction { @@ -39,7 +39,7 @@ class ContextMenusRemoveFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusRemoveFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ContextMenusRemoveAllFunction : public ChromeSyncExtensionFunction { @@ -50,7 +50,7 @@ class ContextMenusRemoveAllFunction : public ChromeSyncExtensionFunction { virtual ~ContextMenusRemoveAllFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index 4df4ef0..2de26a1 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -48,6 +48,63 @@ namespace extensions { namespace cookies = api::cookies; namespace keys = cookies_api_constants; +namespace { + +bool ParseUrl(ChromeAsyncExtensionFunction* function, + const std::string& url_string, + GURL* url, + bool check_host_permissions) { + *url = GURL(url_string); + if (!url->is_valid()) { + function->SetError( + ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError, url_string)); + return false; + } + // Check against host permissions if needed. + if (check_host_permissions && + !PermissionsData::HasHostPermission(function->GetExtension(), *url)) { + function->SetError(ErrorUtils::FormatErrorMessage( + keys::kNoHostPermissionsError, url->spec())); + return false; + } + return true; +} + +bool ParseStoreContext(ChromeAsyncExtensionFunction* function, + std::string* store_id, + net::URLRequestContextGetter** context) { + DCHECK((context || store_id->empty())); + Profile* store_profile = NULL; + if (!store_id->empty()) { + store_profile = cookies_helpers::ChooseProfileFromStoreId( + *store_id, function->GetProfile(), function->include_incognito()); + if (!store_profile) { + function->SetError(ErrorUtils::FormatErrorMessage( + keys::kInvalidStoreIdError, *store_id)); + return false; + } + } else { + // The store ID was not specified; use the current execution context's + // cookie store by default. + // GetCurrentBrowser() already takes into account incognito settings. + Browser* current_browser = function->GetCurrentBrowser(); + if (!current_browser) { + function->SetError(keys::kNoCookieStoreFoundError); + return false; + } + store_profile = current_browser->profile(); + *store_id = cookies_helpers::GetStoreIdFromProfile(store_profile); + } + + if (context) + *context = store_profile->GetRequestContext(); + DCHECK(context); + + return true; +} + +} // namespace + CookiesEventRouter::CookiesEventRouter(content::BrowserContext* context) : profile_(Profile::FromBrowserContext(context)) { CHECK(registrar_.IsEmpty()); @@ -142,57 +199,6 @@ void CookiesEventRouter::DispatchEvent(content::BrowserContext* context, router->BroadcastEvent(event.Pass()); } -bool CookiesFunction::ParseUrl(const std::string& url_string, GURL* url, - bool check_host_permissions) { - *url = GURL(url_string); - if (!url->is_valid()) { - error_ = ErrorUtils::FormatErrorMessage( - keys::kInvalidUrlError, url_string); - return false; - } - // Check against host permissions if needed. - if (check_host_permissions && - !PermissionsData::HasHostPermission(GetExtension(), *url)) { - error_ = ErrorUtils::FormatErrorMessage( - keys::kNoHostPermissionsError, url->spec()); - return false; - } - return true; -} - -bool CookiesFunction::ParseStoreContext( - std::string* store_id, - net::URLRequestContextGetter** context) { - DCHECK((context || store_id->empty())); - Profile* store_profile = NULL; - if (!store_id->empty()) { - store_profile = cookies_helpers::ChooseProfileFromStoreId( - *store_id, GetProfile(), include_incognito()); - if (!store_profile) { - error_ = ErrorUtils::FormatErrorMessage( - keys::kInvalidStoreIdError, *store_id); - return false; - } - } else { - // The store ID was not specified; use the current execution context's - // cookie store by default. - // GetCurrentBrowser() already takes into account incognito settings. - Browser* current_browser = GetCurrentBrowser(); - if (!current_browser) { - error_ = keys::kNoCookieStoreFoundError; - return false; - } - store_profile = current_browser->profile(); - *store_id = cookies_helpers::GetStoreIdFromProfile(store_profile); - } - - if (context) - *context = store_profile->GetRequestContext(); - DCHECK(context); - - return true; -} - CookiesGetFunction::CookiesGetFunction() { } @@ -204,14 +210,14 @@ bool CookiesGetFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE(parsed_args_.get()); // Read/validate input parameters. - if (!ParseUrl(parsed_args_->details.url, &url_, true)) + if (!ParseUrl(this, parsed_args_->details.url, &url_, true)) return false; std::string store_id = parsed_args_->details.store_id.get() ? *parsed_args_->details.store_id : std::string(); net::URLRequestContextGetter* store_context = NULL; - if (!ParseStoreContext(&store_id, &store_context)) + if (!ParseStoreContext(this, &store_id, &store_context)) return false; store_browser_context_ = store_context; if (!parsed_args_->details.store_id.get()) @@ -277,7 +283,7 @@ bool CookiesGetAllFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE(parsed_args_.get()); if (parsed_args_->details.url.get() && - !ParseUrl(*parsed_args_->details.url, &url_, false)) { + !ParseUrl(this, *parsed_args_->details.url, &url_, false)) { return false; } @@ -285,7 +291,7 @@ bool CookiesGetAllFunction::RunImpl() { parsed_args_->details.store_id.get() ? *parsed_args_->details.store_id : std::string(); net::URLRequestContextGetter* store_context = NULL; - if (!ParseStoreContext(&store_id, &store_context)) + if (!ParseStoreContext(this, &store_id, &store_context)) return false; store_browser_context_ = store_context; if (!parsed_args_->details.store_id.get()) @@ -342,14 +348,14 @@ bool CookiesSetFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE(parsed_args_.get()); // Read/validate input parameters. - if (!ParseUrl(parsed_args_->details.url, &url_, true)) + if (!ParseUrl(this, parsed_args_->details.url, &url_, true)) return false; std::string store_id = parsed_args_->details.store_id.get() ? *parsed_args_->details.store_id : std::string(); net::URLRequestContextGetter* store_context = NULL; - if (!ParseStoreContext(&store_id, &store_context)) + if (!ParseStoreContext(this, &store_id, &store_context)) return false; store_browser_context_ = store_context; if (!parsed_args_->details.store_id.get()) @@ -457,14 +463,14 @@ bool CookiesRemoveFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE(parsed_args_.get()); // Read/validate input parameters. - if (!ParseUrl(parsed_args_->details.url, &url_, true)) + if (!ParseUrl(this, parsed_args_->details.url, &url_, true)) return false; std::string store_id = parsed_args_->details.store_id.get() ? *parsed_args_->details.store_id : std::string(); net::URLRequestContextGetter* store_context = NULL; - if (!ParseStoreContext(&store_id, &store_context)) + if (!ParseStoreContext(this, &store_id, &store_context)) return false; store_browser_context_ = store_context; if (!parsed_args_->details.store_id.get()) @@ -511,7 +517,7 @@ void CookiesRemoveFunction::RespondOnUIThread() { SendResponse(true); } -bool CookiesGetAllCookieStoresFunction::RunImpl() { +bool CookiesGetAllCookieStoresFunction::RunSync() { Profile* original_profile = GetProfile(); DCHECK(original_profile); scoped_ptr<base::ListValue> original_tab_ids(new base::ListValue()); @@ -553,10 +559,6 @@ bool CookiesGetAllCookieStoresFunction::RunImpl() { return true; } -void CookiesGetAllCookieStoresFunction::Run() { - SendResponse(RunImpl()); -} - CookiesAPI::CookiesAPI(content::BrowserContext* context) : browser_context_(context) { EventRouter::Get(browser_context_) diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index 0a1ed11..1389ffc 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h @@ -60,34 +60,8 @@ class CookiesEventRouter : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(CookiesEventRouter); }; -// Serves as a base class for all cookies API functions, and defines some -// common functionality for parsing cookies API function arguments. -// Note that all of the functions in this file derive from -// AsyncExtensionFunction, and are not threadsafe, so they should not be -// concurrently accessed from multiple threads. They modify |result_| and other -// member variables directly. -// See extensions/browser/extension_function.h for more information. -class CookiesFunction : public ChromeAsyncExtensionFunction { - protected: - virtual ~CookiesFunction() {} - - // Constructs a GURL from the given url string. Returns false and assigns the - // internal error_ value if the URL is invalid. If |check_host_permissions| is - // true, the URL is also checked against the extension's host permissions, and - // if there is no permission for the URL, this function returns false. - bool ParseUrl(const std::string& url_string, GURL* url, - bool check_host_permissions); - - // Gets the store identified by |store_id| and returns it in |context|. - // If |store_id| contains an empty string, retrieves the current execution - // context's store. In this case, |store_id| is populated with the found - // store, and |context| can be NULL if the caller only wants |store_id|. - bool ParseStoreContext(std::string* store_id, - net::URLRequestContextGetter** context); -}; - // Implements the cookies.get() extension function. -class CookiesGetFunction : public CookiesFunction { +class CookiesGetFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("cookies.get", COOKIES_GET) @@ -110,7 +84,7 @@ class CookiesGetFunction : public CookiesFunction { }; // Implements the cookies.getAll() extension function. -class CookiesGetAllFunction : public CookiesFunction { +class CookiesGetAllFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("cookies.getAll", COOKIES_GETALL) @@ -133,7 +107,7 @@ class CookiesGetAllFunction : public CookiesFunction { }; // Implements the cookies.set() extension function. -class CookiesSetFunction : public CookiesFunction { +class CookiesSetFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("cookies.set", COOKIES_SET) @@ -156,7 +130,7 @@ class CookiesSetFunction : public CookiesFunction { }; // Implements the cookies.remove() extension function. -class CookiesRemoveFunction : public CookiesFunction { +class CookiesRemoveFunction : public ChromeAsyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("cookies.remove", COOKIES_REMOVE) @@ -179,7 +153,7 @@ class CookiesRemoveFunction : public CookiesFunction { }; // Implements the cookies.getAllCookieStores() extension function. -class CookiesGetAllCookieStoresFunction : public CookiesFunction { +class CookiesGetAllCookieStoresFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("cookies.getAllCookieStores", COOKIES_GETALLCOOKIESTORES) @@ -188,9 +162,7 @@ class CookiesGetAllCookieStoresFunction : public CookiesFunction { virtual ~CookiesGetAllCookieStoresFunction() {} // ExtensionFunction: - // CookiesGetAllCookieStoresFunction is sync. - virtual void Run() OVERRIDE; - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class CookiesAPI : public BrowserContextKeyedAPI, diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc index 8b056f0..42cff1f 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc @@ -261,7 +261,7 @@ DesktopCaptureCancelChooseDesktopMediaFunction:: DesktopCaptureCancelChooseDesktopMediaFunction:: ~DesktopCaptureCancelChooseDesktopMediaFunction() {} -bool DesktopCaptureCancelChooseDesktopMediaFunction::RunImpl() { +bool DesktopCaptureCancelChooseDesktopMediaFunction::RunSync() { int request_id; EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &request_id)); diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h index bce38ce..dd62c98 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h @@ -79,7 +79,7 @@ class DesktopCaptureCancelChooseDesktopMediaFunction virtual ~DesktopCaptureCancelChooseDesktopMediaFunction(); // ExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DesktopCaptureRequestsRegistry { diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index cfc1077..5f9ce42 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -313,7 +313,7 @@ void DeveloperPrivateAPI::OnListenerRemoved( namespace api { -bool DeveloperPrivateAutoUpdateFunction::RunImpl() { +bool DeveloperPrivateAutoUpdateFunction::RunSync() { ExtensionUpdater* updater = GetExtensionUpdater(GetProfile()); if (updater) updater->CheckNow(ExtensionUpdater::CheckParams()); @@ -652,7 +652,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() { DeveloperPrivateGetItemsInfoFunction::~DeveloperPrivateGetItemsInfoFunction() {} -bool DeveloperPrivateAllowFileAccessFunction::RunImpl() { +bool DeveloperPrivateAllowFileAccessFunction::RunSync() { scoped_ptr<AllowFileAccess::Params> params( AllowFileAccess::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -683,7 +683,7 @@ bool DeveloperPrivateAllowFileAccessFunction::RunImpl() { DeveloperPrivateAllowFileAccessFunction:: ~DeveloperPrivateAllowFileAccessFunction() {} -bool DeveloperPrivateAllowIncognitoFunction::RunImpl() { +bool DeveloperPrivateAllowIncognitoFunction::RunSync() { scoped_ptr<AllowIncognito::Params> params( AllowIncognito::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -703,8 +703,7 @@ bool DeveloperPrivateAllowIncognitoFunction::RunImpl() { DeveloperPrivateAllowIncognitoFunction:: ~DeveloperPrivateAllowIncognitoFunction() {} - -bool DeveloperPrivateReloadFunction::RunImpl() { +bool DeveloperPrivateReloadFunction::RunSync() { scoped_ptr<Reload::Params> params(Reload::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -714,7 +713,7 @@ bool DeveloperPrivateReloadFunction::RunImpl() { return true; } -bool DeveloperPrivateShowPermissionsDialogFunction::RunImpl() { +bool DeveloperPrivateShowPermissionsDialogFunction::RunSync() { EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &extension_id_)); ExtensionService* service = GetProfile()->GetExtensionService(); CHECK(!extension_id_.empty()); @@ -771,7 +770,7 @@ DeveloperPrivateShowPermissionsDialogFunction:: DeveloperPrivateEnableFunction::DeveloperPrivateEnableFunction() {} -bool DeveloperPrivateEnableFunction::RunImpl() { +bool DeveloperPrivateEnableFunction::RunSync() { scoped_ptr<Enable::Params> params(Enable::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -850,7 +849,7 @@ void DeveloperPrivateEnableFunction::OnRequirementsChecked( DeveloperPrivateEnableFunction::~DeveloperPrivateEnableFunction() {} -bool DeveloperPrivateInspectFunction::RunImpl() { +bool DeveloperPrivateInspectFunction::RunSync() { scoped_ptr<developer::Inspect::Params> params( developer::Inspect::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get() != NULL); @@ -1296,7 +1295,7 @@ void DeveloperPrivateChoosePathFunction::FileSelectionCanceled() { DeveloperPrivateChoosePathFunction::~DeveloperPrivateChoosePathFunction() {} -bool DeveloperPrivateIsProfileManagedFunction::RunImpl() { +bool DeveloperPrivateIsProfileManagedFunction::RunSync() { SetResult(new base::FundamentalValue(GetProfile()->IsManaged())); return true; } diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h index 9d0e0f38..41ce8e4 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h @@ -149,7 +149,7 @@ class DeveloperPrivateAutoUpdateFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateAutoUpdateFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateGetItemsInfoFunction @@ -202,7 +202,7 @@ class DeveloperPrivateInspectFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateInspectFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateAllowFileAccessFunction @@ -215,7 +215,7 @@ class DeveloperPrivateAllowFileAccessFunction virtual ~DeveloperPrivateAllowFileAccessFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateAllowIncognitoFunction @@ -228,7 +228,7 @@ class DeveloperPrivateAllowIncognitoFunction virtual ~DeveloperPrivateAllowIncognitoFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { @@ -240,7 +240,7 @@ class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { virtual ~DeveloperPrivateReloadFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateShowPermissionsDialogFunction @@ -255,7 +255,7 @@ class DeveloperPrivateShowPermissionsDialogFunction virtual ~DeveloperPrivateShowPermissionsDialogFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; // Overridden from ExtensionInstallPrompt::Delegate virtual void InstallUIProceed() OVERRIDE; @@ -281,7 +281,7 @@ class DeveloperPrivateEnableFunction void OnRequirementsChecked(std::string extension_id, std::vector<std::string> requirements_errors); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: scoped_ptr<RequirementsChecker> requirements_checker_; @@ -370,7 +370,7 @@ class DeveloperPrivateIsProfileManagedFunction virtual ~DeveloperPrivateIsProfileManagedFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class DeveloperPrivateLoadDirectoryFunction diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index c94aa59..a89ed7a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -1073,7 +1073,7 @@ DownloadsSearchFunction::DownloadsSearchFunction() {} DownloadsSearchFunction::~DownloadsSearchFunction() {} -bool DownloadsSearchFunction::RunImpl() { +bool DownloadsSearchFunction::RunSync() { scoped_ptr<downloads::Search::Params> params( downloads::Search::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1113,7 +1113,7 @@ DownloadsPauseFunction::DownloadsPauseFunction() {} DownloadsPauseFunction::~DownloadsPauseFunction() {} -bool DownloadsPauseFunction::RunImpl() { +bool DownloadsPauseFunction::RunSync() { scoped_ptr<downloads::Pause::Params> params( downloads::Pause::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1134,7 +1134,7 @@ DownloadsResumeFunction::DownloadsResumeFunction() {} DownloadsResumeFunction::~DownloadsResumeFunction() {} -bool DownloadsResumeFunction::RunImpl() { +bool DownloadsResumeFunction::RunSync() { scoped_ptr<downloads::Resume::Params> params( downloads::Resume::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1155,7 +1155,7 @@ DownloadsCancelFunction::DownloadsCancelFunction() {} DownloadsCancelFunction::~DownloadsCancelFunction() {} -bool DownloadsCancelFunction::RunImpl() { +bool DownloadsCancelFunction::RunSync() { scoped_ptr<downloads::Resume::Params> params( downloads::Resume::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1174,7 +1174,7 @@ DownloadsEraseFunction::DownloadsEraseFunction() {} DownloadsEraseFunction::~DownloadsEraseFunction() {} -bool DownloadsEraseFunction::RunImpl() { +bool DownloadsEraseFunction::RunSync() { scoped_ptr<downloads::Erase::Params> params( downloads::Erase::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1349,7 +1349,7 @@ DownloadsOpenFunction::DownloadsOpenFunction() {} DownloadsOpenFunction::~DownloadsOpenFunction() {} -bool DownloadsOpenFunction::RunImpl() { +bool DownloadsOpenFunction::RunSync() { scoped_ptr<downloads::Open::Params> params( downloads::Open::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1400,7 +1400,7 @@ DownloadsSetShelfEnabledFunction::DownloadsSetShelfEnabledFunction() {} DownloadsSetShelfEnabledFunction::~DownloadsSetShelfEnabledFunction() {} -bool DownloadsSetShelfEnabledFunction::RunImpl() { +bool DownloadsSetShelfEnabledFunction::RunSync() { scoped_ptr<downloads::SetShelfEnabled::Params> params( downloads::SetShelfEnabled::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index cf78bb6..b4c2358 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -111,7 +111,7 @@ class DownloadsSearchFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.search", DOWNLOADS_SEARCH) DownloadsSearchFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsSearchFunction(); @@ -124,7 +124,7 @@ class DownloadsPauseFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.pause", DOWNLOADS_PAUSE) DownloadsPauseFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsPauseFunction(); @@ -137,7 +137,7 @@ class DownloadsResumeFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.resume", DOWNLOADS_RESUME) DownloadsResumeFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsResumeFunction(); @@ -150,7 +150,7 @@ class DownloadsCancelFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.cancel", DOWNLOADS_CANCEL) DownloadsCancelFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsCancelFunction(); @@ -163,7 +163,7 @@ class DownloadsEraseFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.erase", DOWNLOADS_ERASE) DownloadsEraseFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsEraseFunction(); @@ -242,7 +242,7 @@ class DownloadsOpenFunction : public ChromeSyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloads.open", DOWNLOADS_OPEN) DownloadsOpenFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsOpenFunction(); @@ -256,7 +256,7 @@ class DownloadsSetShelfEnabledFunction : public ChromeSyncExtensionFunction { DECLARE_EXTENSION_FUNCTION("downloads.setShelfEnabled", DOWNLOADS_SETSHELFENABLED) DownloadsSetShelfEnabledFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; protected: virtual ~DownloadsSetShelfEnabledFunction(); diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index 02ef495..a74d44f 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -518,7 +518,7 @@ ExtensionActionFunction::ExtensionActionFunction() ExtensionActionFunction::~ExtensionActionFunction() { } -bool ExtensionActionFunction::RunImpl() { +bool ExtensionActionFunction::RunSync() { ExtensionActionManager* manager = ExtensionActionManager::Get(GetProfile()); const Extension* extension = GetExtension(); if (StartsWithASCII(name(), "systemIndicator.", false)) { @@ -921,10 +921,10 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) { return true; } -bool EnablePageActionsFunction::RunImpl() { +bool EnablePageActionsFunction::RunSync() { return SetPageActionEnabled(true); } -bool DisablePageActionsFunction::RunImpl() { +bool DisablePageActionsFunction::RunSync() { return SetPageActionEnabled(false); } diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h index dc1b2f0..5e013de 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.h +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h @@ -125,7 +125,7 @@ class ExtensionActionFunction : public ChromeSyncExtensionFunction { protected: ExtensionActionFunction(); virtual ~ExtensionActionFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; virtual bool RunExtensionAction() = 0; bool ExtractDataFromArguments(); @@ -449,7 +449,7 @@ class EnablePageActionsFunction : public PageActionsFunction { virtual ~EnablePageActionsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // Implement chrome.pageActions.disableForTab(). @@ -462,7 +462,7 @@ class DisablePageActionsFunction : public PageActionsFunction { virtual ~DisablePageActionsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; #endif // CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_ACTION_API_H_ diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index 5cbc565..4a7eaae 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -96,7 +96,7 @@ void FeedbackPrivateAPI::RequestFeedback( // static base::Closure* FeedbackPrivateGetStringsFunction::test_callback_ = NULL; -bool FeedbackPrivateGetStringsFunction::RunImpl() { +bool FeedbackPrivateGetStringsFunction::RunSync() { base::DictionaryValue* dict = new base::DictionaryValue(); SetResult(dict); @@ -132,7 +132,7 @@ bool FeedbackPrivateGetStringsFunction::RunImpl() { return true; } -bool FeedbackPrivateGetUserEmailFunction::RunImpl() { +bool FeedbackPrivateGetUserEmailFunction::RunSync() { // TODO(rkc): Remove logging once crbug.com/284662 is closed. LOG(WARNING) << "FEEDBACK_DEBUG: User e-mail requested."; FeedbackService* service = diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h index 830e675..02fabe3 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h @@ -61,7 +61,7 @@ class FeedbackPrivateGetStringsFunction : public ChromeSyncExtensionFunction { virtual ~FeedbackPrivateGetStringsFunction() {} // SyncExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: static base::Closure* test_callback_; @@ -74,7 +74,7 @@ class FeedbackPrivateGetUserEmailFunction : public ChromeSyncExtensionFunction { protected: virtual ~FeedbackPrivateGetUserEmailFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class FeedbackPrivateGetSystemInformationFunction diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index cff70ff..cafcb0e 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -259,7 +259,7 @@ std::vector<base::FilePath> GetGrayListedDirectories() { } // namespace file_system_api -bool FileSystemGetDisplayPathFunction::RunImpl() { +bool FileSystemGetDisplayPathFunction::RunSync() { std::string filesystem_name; std::string filesystem_path; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &filesystem_name)); @@ -402,7 +402,7 @@ void FileSystemGetWritableEntryFunction::SetIsDirectoryOnFileThread() { } } -bool FileSystemIsWritableEntryFunction::RunImpl() { +bool FileSystemIsWritableEntryFunction::RunSync() { std::string filesystem_name; std::string filesystem_path; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &filesystem_name)); @@ -949,7 +949,7 @@ void FileSystemRetainEntryFunction::SetIsDirectoryOnFileThread() { is_directory_ = base::DirectoryExists(path_); } -bool FileSystemIsRestorableFunction::RunImpl() { +bool FileSystemIsRestorableFunction::RunSync() { std::string entry_id; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &entry_id)); SetResult(new base::FundamentalValue(SavedFilesService::Get( diff --git a/chrome/browser/extensions/api/file_system/file_system_api.h b/chrome/browser/extensions/api/file_system/file_system_api.h index a8ff513..a2a8c70 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.h +++ b/chrome/browser/extensions/api/file_system/file_system_api.h @@ -40,7 +40,7 @@ class FileSystemGetDisplayPathFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemGetDisplayPathFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class FileSystemEntryFunction : public ChromeAsyncExtensionFunction { @@ -105,7 +105,7 @@ class FileSystemIsWritableEntryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsWritableEntryFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class FileSystemChooseEntryFunction : public FileSystemEntryFunction { @@ -198,7 +198,7 @@ class FileSystemIsRestorableFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsRestorableFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class FileSystemRestoreEntryFunction : public FileSystemEntryFunction { diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc index befb3b3..2031cf7 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc @@ -220,7 +220,7 @@ FontSettingsAPI::GetFactoryInstance() { return g_factory.Pointer(); } -bool FontSettingsClearFontFunction::RunImpl() { +bool FontSettingsClearFontFunction::RunSync() { if (GetProfile()->IsOffTheRecord()) { error_ = kSetFromIncognitoError; return false; @@ -242,7 +242,7 @@ bool FontSettingsClearFontFunction::RunImpl() { return true; } -bool FontSettingsGetFontFunction::RunImpl() { +bool FontSettingsGetFontFunction::RunSync() { scoped_ptr<fonts::GetFont::Params> params( fonts::GetFont::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -273,7 +273,7 @@ bool FontSettingsGetFontFunction::RunImpl() { return true; } -bool FontSettingsSetFontFunction::RunImpl() { +bool FontSettingsSetFontFunction::RunSync() { if (GetProfile()->IsOffTheRecord()) { error_ = kSetFromIncognitoError; return false; @@ -343,7 +343,7 @@ bool FontSettingsGetFontListFunction::CopyFontsToResult( return true; } -bool ClearFontPrefExtensionFunction::RunImpl() { +bool ClearFontPrefExtensionFunction::RunSync() { if (GetProfile()->IsOffTheRecord()) { error_ = kSetFromIncognitoError; return false; @@ -354,7 +354,7 @@ bool ClearFontPrefExtensionFunction::RunImpl() { return true; } -bool GetFontPrefExtensionFunction::RunImpl() { +bool GetFontPrefExtensionFunction::RunSync() { PrefService* prefs = GetProfile()->GetPrefs(); const PrefService::Preference* pref = prefs->FindPreference(GetPrefName()); EXTENSION_FUNCTION_VALIDATE(pref); @@ -374,7 +374,7 @@ bool GetFontPrefExtensionFunction::RunImpl() { return true; } -bool SetFontPrefExtensionFunction::RunImpl() { +bool SetFontPrefExtensionFunction::RunSync() { if (GetProfile()->IsOffTheRecord()) { error_ = kSetFromIncognitoError; return false; diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 0f65f18..8aa6963 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -105,7 +105,7 @@ class FontSettingsClearFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsClearFontFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // fontSettings.getFont API function. @@ -117,7 +117,7 @@ class FontSettingsGetFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsGetFontFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // fontSettings.setFont API function. @@ -129,7 +129,7 @@ class FontSettingsSetFontFunction : public ChromeSyncExtensionFunction { virtual ~FontSettingsSetFontFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // fontSettings.getFontList API function. @@ -155,7 +155,7 @@ class ClearFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~ClearFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; // Implementations should return the name of the preference to clear, like // "webkit.webprefs.default_font_size". @@ -168,7 +168,7 @@ class GetFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~GetFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; // Implementations should return the name of the preference to get, like // "webkit.webprefs.default_font_size". @@ -185,7 +185,7 @@ class SetFontPrefExtensionFunction : public ChromeSyncExtensionFunction { virtual ~SetFontPrefExtensionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; // Implementations should return the name of the preference to set, like // "webkit.webprefs.default_font_size". diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index cd216a1..51670d2 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -235,12 +235,6 @@ void HistoryAPI::OnListenerAdded(const EventListenerInfo& details) { EventRouter::Get(browser_context_)->UnregisterObserver(this); } -void HistoryFunction::Run() { - if (!RunImpl()) { - SendResponse(false); - } -} - bool HistoryFunction::ValidateUrl(const std::string& url_string, GURL* url) { GURL temp_url(url_string); if (!temp_url.is_valid()) { diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index be40b13..3b13b28 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h @@ -89,7 +89,6 @@ void BrowserContextKeyedAPIFactory<HistoryAPI>::DeclareFactoryDependencies(); class HistoryFunction : public ChromeAsyncExtensionFunction { protected: virtual ~HistoryFunction() {} - virtual void Run() OVERRIDE; bool ValidateUrl(const std::string& url_string, GURL* url); bool VerifyDeleteAllowed(); diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc index dc86119..4dc9218 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc @@ -65,7 +65,7 @@ void HotwordPrivateEventService::SignalEvent() { router->BroadcastEvent(event.Pass()); } -bool HotwordPrivateSetEnabledFunction::RunImpl() { +bool HotwordPrivateSetEnabledFunction::RunSync() { scoped_ptr<api::hotword_private::SetEnabled::Params> params( api::hotword_private::SetEnabled::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -75,7 +75,7 @@ bool HotwordPrivateSetEnabledFunction::RunImpl() { return true; } -bool HotwordPrivateSetAudioLoggingEnabledFunction::RunImpl() { +bool HotwordPrivateSetAudioLoggingEnabledFunction::RunSync() { scoped_ptr<api::hotword_private::SetEnabled::Params> params( api::hotword_private::SetEnabled::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -85,7 +85,7 @@ bool HotwordPrivateSetAudioLoggingEnabledFunction::RunImpl() { return true; } -bool HotwordPrivateGetStatusFunction::RunImpl() { +bool HotwordPrivateGetStatusFunction::RunSync() { api::hotword_private::StatusDetails result; HotwordService* hotword_service = diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.h b/chrome/browser/extensions/api/hotword_private/hotword_private_api.h index 6c1e4c1..bd07501 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.h +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.h @@ -49,7 +49,7 @@ class HotwordPrivateSetEnabledFunction : public ChromeSyncExtensionFunction { virtual ~HotwordPrivateSetEnabledFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class HotwordPrivateSetAudioLoggingEnabledFunction @@ -62,7 +62,7 @@ class HotwordPrivateSetAudioLoggingEnabledFunction virtual ~HotwordPrivateSetAudioLoggingEnabledFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class HotwordPrivateGetStatusFunction : public ChromeSyncExtensionFunction { @@ -74,7 +74,7 @@ class HotwordPrivateGetStatusFunction : public ChromeSyncExtensionFunction { virtual ~HotwordPrivateGetStatusFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/chrome/browser/extensions/api/i18n/i18n_api.cc index e2a4578..ca40229 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/chrome/browser/extensions/api/i18n/i18n_api.cc @@ -27,7 +27,7 @@ static const char kEmptyAcceptLanguagesError[] = "accept-languages is empty."; } -bool I18nGetAcceptLanguagesFunction::RunImpl() { +bool I18nGetAcceptLanguagesFunction::RunSync() { std::string accept_languages = GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages); // Currently, there are 2 ways to set browser's accept-languages: through UI diff --git a/chrome/browser/extensions/api/i18n/i18n_api.h b/chrome/browser/extensions/api/i18n/i18n_api.h index 068d9f8..df2de9d 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.h +++ b/chrome/browser/extensions/api/i18n/i18n_api.h @@ -14,7 +14,7 @@ namespace extensions { class I18nGetAcceptLanguagesFunction : public ChromeSyncExtensionFunction { virtual ~I18nGetAcceptLanguagesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("i18n.getAcceptLanguages", I18N_GETACCEPTLANGUAGES) }; diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 3a096e9..65dc4a7 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -689,7 +689,7 @@ IdentityRemoveCachedAuthTokenFunction:: ~IdentityRemoveCachedAuthTokenFunction() { } -bool IdentityRemoveCachedAuthTokenFunction::RunImpl() { +bool IdentityRemoveCachedAuthTokenFunction::RunSync() { if (GetProfile()->IsOffTheRecord()) { error_ = identity_constants::kOffTheRecord; return false; diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h index 77577ce..79b5ee0 100644 --- a/chrome/browser/extensions/api/identity/identity_api.h +++ b/chrome/browser/extensions/api/identity/identity_api.h @@ -284,7 +284,7 @@ class IdentityRemoveCachedAuthTokenFunction virtual ~IdentityRemoveCachedAuthTokenFunction(); // SyncExtensionFunction implementation: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class IdentityLaunchWebAuthFlowFunction : public ChromeAsyncExtensionFunction, diff --git a/chrome/browser/extensions/api/identity_private/identity_private_api.cc b/chrome/browser/extensions/api/identity_private/identity_private_api.cc index 78d63a2..08254ab 100644 --- a/chrome/browser/extensions/api/identity_private/identity_private_api.cc +++ b/chrome/browser/extensions/api/identity_private/identity_private_api.cc @@ -18,7 +18,7 @@ IdentityPrivateGetResourcesFunction::IdentityPrivateGetResourcesFunction() {} IdentityPrivateGetResourcesFunction::~IdentityPrivateGetResourcesFunction() {} -bool IdentityPrivateGetResourcesFunction::RunImpl() { +bool IdentityPrivateGetResourcesFunction::RunSync() { base::DictionaryValue* result = new base::DictionaryValue; result->SetString("IDR_CLOSE_DIALOG", @@ -35,4 +35,4 @@ bool IdentityPrivateGetResourcesFunction::RunImpl() { return true; } -} // extensions +} // namespace extensions diff --git a/chrome/browser/extensions/api/identity_private/identity_private_api.h b/chrome/browser/extensions/api/identity_private/identity_private_api.h index f2d3b1d..3e8f0c0 100644 --- a/chrome/browser/extensions/api/identity_private/identity_private_api.h +++ b/chrome/browser/extensions/api/identity_private/identity_private_api.h @@ -19,7 +19,7 @@ class IdentityPrivateGetResourcesFunction : public SyncExtensionFunction { virtual ~IdentityPrivateGetResourcesFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(IdentityPrivateGetResourcesFunction); diff --git a/chrome/browser/extensions/api/idle/idle_api.cc b/chrome/browser/extensions/api/idle/idle_api.cc index 2a0d2d8..a04d739 100644 --- a/chrome/browser/extensions/api/idle/idle_api.cc +++ b/chrome/browser/extensions/api/idle/idle_api.cc @@ -47,7 +47,7 @@ void IdleQueryStateFunction::IdleStateCallback(IdleState state) { SendResponse(true); } -bool IdleSetDetectionIntervalFunction::RunImpl() { +bool IdleSetDetectionIntervalFunction::RunSync() { int threshold; EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &threshold)); threshold = ClampThreshold(threshold); diff --git a/chrome/browser/extensions/api/idle/idle_api.h b/chrome/browser/extensions/api/idle/idle_api.h index e14f1de..79070e4 100644 --- a/chrome/browser/extensions/api/idle/idle_api.h +++ b/chrome/browser/extensions/api/idle/idle_api.h @@ -35,7 +35,7 @@ class IdleSetDetectionIntervalFunction : public ChromeSyncExtensionFunction { virtual ~IdleSetDetectionIntervalFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/idltest/idltest_api.cc b/chrome/browser/extensions/api/idltest/idltest_api.cc index 63e1efe..71af4ac 100644 --- a/chrome/browser/extensions/api/idltest/idltest_api.cc +++ b/chrome/browser/extensions/api/idltest/idltest_api.cc @@ -21,21 +21,21 @@ base::ListValue* CopyBinaryValueToIntegerList(const BinaryValue* input) { } // namespace -bool IdltestSendArrayBufferFunction::RunImpl() { +bool IdltestSendArrayBufferFunction::RunSync() { BinaryValue* input = NULL; EXTENSION_FUNCTION_VALIDATE(args_ != NULL && args_->GetBinary(0, &input)); SetResult(CopyBinaryValueToIntegerList(input)); return true; } -bool IdltestSendArrayBufferViewFunction::RunImpl() { +bool IdltestSendArrayBufferViewFunction::RunSync() { BinaryValue* input = NULL; EXTENSION_FUNCTION_VALIDATE(args_ != NULL && args_->GetBinary(0, &input)); SetResult(CopyBinaryValueToIntegerList(input)); return true; } -bool IdltestGetArrayBufferFunction::RunImpl() { +bool IdltestGetArrayBufferFunction::RunSync() { std::string hello = "hello world"; BinaryValue* output = BinaryValue::CreateWithCopiedBuffer(hello.c_str(), hello.size()); diff --git a/chrome/browser/extensions/api/idltest/idltest_api.h b/chrome/browser/extensions/api/idltest/idltest_api.h index 93b9490..5f93937 100644 --- a/chrome/browser/extensions/api/idltest/idltest_api.h +++ b/chrome/browser/extensions/api/idltest/idltest_api.h @@ -13,7 +13,7 @@ class IdltestSendArrayBufferFunction : public SyncExtensionFunction { protected: virtual ~IdltestSendArrayBufferFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class IdltestSendArrayBufferViewFunction : public SyncExtensionFunction { @@ -23,7 +23,7 @@ class IdltestSendArrayBufferViewFunction : public SyncExtensionFunction { protected: virtual ~IdltestSendArrayBufferViewFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class IdltestGetArrayBufferFunction : public SyncExtensionFunction { @@ -32,7 +32,7 @@ class IdltestGetArrayBufferFunction : public SyncExtensionFunction { protected: virtual ~IdltestGetArrayBufferFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; #endif // CHROME_BROWSER_EXTENSIONS_API_IDLTEST_IDLTEST_API_H_ diff --git a/chrome/browser/extensions/api/input/input.cc b/chrome/browser/extensions/api/input/input.cc index f8db0cd..657bad9 100644 --- a/chrome/browser/extensions/api/input/input.cc +++ b/chrome/browser/extensions/api/input/input.cc @@ -33,7 +33,7 @@ const char kNotYetImplementedError[] = namespace extensions { -bool VirtualKeyboardPrivateInsertTextFunction::RunImpl() { +bool VirtualKeyboardPrivateInsertTextFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) base::string16 text; @@ -46,7 +46,7 @@ bool VirtualKeyboardPrivateInsertTextFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateMoveCursorFunction::RunImpl() { +bool VirtualKeyboardPrivateMoveCursorFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) if (!CommandLine::ForCurrentProcess()->HasSwitch( @@ -69,7 +69,7 @@ bool VirtualKeyboardPrivateMoveCursorFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateSendKeyEventFunction::RunImpl() { +bool VirtualKeyboardPrivateSendKeyEventFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) base::Value* options_value = NULL; @@ -101,7 +101,7 @@ bool VirtualKeyboardPrivateSendKeyEventFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateHideKeyboardFunction::RunImpl() { +bool VirtualKeyboardPrivateHideKeyboardFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) UMA_HISTOGRAM_ENUMERATION( @@ -121,7 +121,7 @@ bool VirtualKeyboardPrivateHideKeyboardFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateLockKeyboardFunction::RunImpl() { +bool VirtualKeyboardPrivateLockKeyboardFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) bool lock; @@ -134,7 +134,7 @@ bool VirtualKeyboardPrivateLockKeyboardFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateKeyboardLoadedFunction::RunImpl() { +bool VirtualKeyboardPrivateKeyboardLoadedFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) keyboard::MarkKeyboardLoadFinished(); @@ -146,7 +146,7 @@ bool VirtualKeyboardPrivateKeyboardLoadedFunction::RunImpl() { #endif } -bool VirtualKeyboardPrivateGetKeyboardConfigFunction::RunImpl() { +bool VirtualKeyboardPrivateGetKeyboardConfigFunction::RunSync() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); #if defined(USE_ASH) base::DictionaryValue* results = new base::DictionaryValue(); diff --git a/chrome/browser/extensions/api/input/input.h b/chrome/browser/extensions/api/input/input.h index fd980ea..f682dc2 100644 --- a/chrome/browser/extensions/api/input/input.h +++ b/chrome/browser/extensions/api/input/input.h @@ -24,7 +24,7 @@ class VirtualKeyboardPrivateInsertTextFunction : public SyncExtensionFunction { virtual ~VirtualKeyboardPrivateInsertTextFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateMoveCursorFunction : public SyncExtensionFunction { @@ -36,7 +36,7 @@ class VirtualKeyboardPrivateMoveCursorFunction : public SyncExtensionFunction { virtual ~VirtualKeyboardPrivateMoveCursorFunction() {} // ExtensionFunction. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateSendKeyEventFunction @@ -50,7 +50,7 @@ class VirtualKeyboardPrivateSendKeyEventFunction virtual ~VirtualKeyboardPrivateSendKeyEventFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateHideKeyboardFunction @@ -64,7 +64,7 @@ class VirtualKeyboardPrivateHideKeyboardFunction virtual ~VirtualKeyboardPrivateHideKeyboardFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateLockKeyboardFunction @@ -78,7 +78,7 @@ class VirtualKeyboardPrivateLockKeyboardFunction virtual ~VirtualKeyboardPrivateLockKeyboardFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateKeyboardLoadedFunction @@ -92,7 +92,7 @@ class VirtualKeyboardPrivateKeyboardLoadedFunction virtual ~VirtualKeyboardPrivateKeyboardLoadedFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class VirtualKeyboardPrivateGetKeyboardConfigFunction @@ -106,7 +106,7 @@ class VirtualKeyboardPrivateGetKeyboardConfigFunction virtual ~VirtualKeyboardPrivateGetKeyboardConfigFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputAPI : public BrowserContextKeyedAPI { diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index 31bed2d..8f05189 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -433,7 +433,7 @@ InputImeEventRouter::InputImeEventRouter() InputImeEventRouter::~InputImeEventRouter() {} -bool InputImeSetCompositionFunction::RunImpl() { +bool InputImeSetCompositionFunction::RunSync() { InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); if (!engine) { @@ -479,7 +479,7 @@ bool InputImeSetCompositionFunction::RunImpl() { return true; } -bool InputImeClearCompositionFunction::RunImpl() { +bool InputImeClearCompositionFunction::RunSync() { InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); if (!engine) { @@ -497,7 +497,7 @@ bool InputImeClearCompositionFunction::RunImpl() { return true; } -bool InputImeCommitTextFunction::RunImpl() { +bool InputImeCommitTextFunction::RunSync() { // TODO(zork): Support committing when not active. InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); @@ -562,7 +562,7 @@ bool InputImeSendKeyEventsFunction::RunImpl() { return true; } -bool InputImeSetCandidateWindowPropertiesFunction::RunImpl() { +bool InputImeSetCandidateWindowPropertiesFunction::RunSync() { scoped_ptr<SetCandidateWindowProperties::Params> parent_params( SetCandidateWindowProperties::Params::Create(*args_)); const SetCandidateWindowProperties::Params::Parameters& @@ -637,7 +637,7 @@ bool InputImeSetCandidateWindowPropertiesFunction::RunImpl() { return true; } -bool InputImeSetCandidatesFunction::RunImpl() { +bool InputImeSetCandidatesFunction::RunSync() { InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); if (!engine) { @@ -673,7 +673,7 @@ bool InputImeSetCandidatesFunction::RunImpl() { return true; } -bool InputImeSetCursorPositionFunction::RunImpl() { +bool InputImeSetCursorPositionFunction::RunSync() { InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); if (!engine) { @@ -692,7 +692,7 @@ bool InputImeSetCursorPositionFunction::RunImpl() { return true; } -bool InputImeSetMenuItemsFunction::RunImpl() { +bool InputImeSetMenuItemsFunction::RunSync() { scoped_ptr<SetMenuItems::Params> parent_params( SetMenuItems::Params::Create(*args_)); const SetMenuItems::Params::Parameters& params = @@ -719,7 +719,7 @@ bool InputImeSetMenuItemsFunction::RunImpl() { return true; } -bool InputImeUpdateMenuItemsFunction::RunImpl() { +bool InputImeUpdateMenuItemsFunction::RunSync() { scoped_ptr<UpdateMenuItems::Params> parent_params( UpdateMenuItems::Params::Create(*args_)); const UpdateMenuItems::Params::Parameters& params = @@ -746,7 +746,7 @@ bool InputImeUpdateMenuItemsFunction::RunImpl() { return true; } -bool InputImeDeleteSurroundingTextFunction::RunImpl() { +bool InputImeDeleteSurroundingTextFunction::RunSync() { scoped_ptr<DeleteSurroundingText::Params> parent_params( DeleteSurroundingText::Params::Create(*args_)); const DeleteSurroundingText::Params::Parameters& params = diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h index 1765968..2f0d833 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.h +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h @@ -87,7 +87,7 @@ class InputImeSetCompositionFunction : public SyncExtensionFunction { virtual ~InputImeSetCompositionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeClearCompositionFunction : public SyncExtensionFunction { @@ -99,7 +99,7 @@ class InputImeClearCompositionFunction : public SyncExtensionFunction { virtual ~InputImeClearCompositionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeCommitTextFunction : public SyncExtensionFunction { @@ -110,7 +110,7 @@ class InputImeCommitTextFunction : public SyncExtensionFunction { virtual ~InputImeCommitTextFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeSetCandidateWindowPropertiesFunction @@ -123,7 +123,7 @@ class InputImeSetCandidateWindowPropertiesFunction virtual ~InputImeSetCandidateWindowPropertiesFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeSetCandidatesFunction : public SyncExtensionFunction { @@ -134,7 +134,7 @@ class InputImeSetCandidatesFunction : public SyncExtensionFunction { virtual ~InputImeSetCandidatesFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeSetCursorPositionFunction : public SyncExtensionFunction { @@ -146,7 +146,7 @@ class InputImeSetCursorPositionFunction : public SyncExtensionFunction { virtual ~InputImeSetCursorPositionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeSetMenuItemsFunction : public SyncExtensionFunction { @@ -157,7 +157,7 @@ class InputImeSetMenuItemsFunction : public SyncExtensionFunction { virtual ~InputImeSetMenuItemsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction { @@ -169,7 +169,7 @@ class InputImeUpdateMenuItemsFunction : public SyncExtensionFunction { virtual ~InputImeUpdateMenuItemsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction { @@ -180,7 +180,7 @@ class InputImeDeleteSurroundingTextFunction : public SyncExtensionFunction { virtual ~InputImeDeleteSurroundingTextFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class InputImeKeyEventHandledFunction : public AsyncExtensionFunction { diff --git a/chrome/browser/extensions/api/location/location_api.cc b/chrome/browser/extensions/api/location/location_api.cc index 81b6132..7c91782 100644 --- a/chrome/browser/extensions/api/location/location_api.cc +++ b/chrome/browser/extensions/api/location/location_api.cc @@ -25,7 +25,7 @@ bool IsNegative(double* value) { return value && *value < 0.0; } -bool LocationWatchLocationFunction::RunImpl() { +bool LocationWatchLocationFunction::RunSync() { scoped_ptr<WatchLocation::Params> params( WatchLocation::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -58,7 +58,7 @@ bool LocationWatchLocationFunction::RunImpl() { return true; } -bool LocationClearWatchFunction::RunImpl() { +bool LocationClearWatchFunction::RunSync() { scoped_ptr<ClearWatch::Params> params( ClearWatch::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/location/location_api.h b/chrome/browser/extensions/api/location/location_api.h index 929287c..570abaed 100644 --- a/chrome/browser/extensions/api/location/location_api.h +++ b/chrome/browser/extensions/api/location/location_api.h @@ -18,7 +18,7 @@ class LocationWatchLocationFunction : public ChromeSyncExtensionFunction { virtual ~LocationWatchLocationFunction() {} // SyncExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class LocationClearWatchFunction : public ChromeSyncExtensionFunction { @@ -30,7 +30,7 @@ class LocationClearWatchFunction : public ChromeSyncExtensionFunction { virtual ~LocationClearWatchFunction() {} // SyncExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h index 183a1a1..24c8fcd 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api.h +++ b/chrome/browser/extensions/api/log_private/log_private_api.h @@ -104,7 +104,7 @@ class LogPrivateStartNetInternalsWatchFunction protected: virtual ~LogPrivateStartNetInternalsWatchFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(LogPrivateStartNetInternalsWatchFunction); @@ -119,7 +119,7 @@ class LogPrivateStopNetInternalsWatchFunction protected: virtual ~LogPrivateStopNetInternalsWatchFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(LogPrivateStopNetInternalsWatchFunction); diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc index d8a09fa..e0ffc17 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc @@ -216,7 +216,7 @@ LogPrivateStartNetInternalsWatchFunction:: ~LogPrivateStartNetInternalsWatchFunction() { } -bool LogPrivateStartNetInternalsWatchFunction::RunImpl() { +bool LogPrivateStartNetInternalsWatchFunction::RunSync() { LogPrivateAPI::Get(GetProfile())->StartNetInternalsWatch(extension_id()); return true; } @@ -229,7 +229,7 @@ LogPrivateStopNetInternalsWatchFunction:: ~LogPrivateStopNetInternalsWatchFunction() { } -bool LogPrivateStopNetInternalsWatchFunction::RunImpl() { +bool LogPrivateStopNetInternalsWatchFunction::RunSync() { LogPrivateAPI::Get(GetProfile())->StopNetInternalsWatch(extension_id()); return true; } diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 851844b..2384461 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -235,7 +235,7 @@ ExtensionService* AsyncManagementFunction::service() { return GetProfile()->GetExtensionService(); } -bool ManagementGetAllFunction::RunImpl() { +bool ManagementGetAllFunction::RunSync() { ExtensionInfoList extensions; ExtensionRegistry* registry = ExtensionRegistry::Get(GetProfile()); ExtensionSystem* system = ExtensionSystem::Get(GetProfile()); @@ -248,7 +248,7 @@ bool ManagementGetAllFunction::RunImpl() { return true; } -bool ManagementGetFunction::RunImpl() { +bool ManagementGetFunction::RunSync() { scoped_ptr<management::Get::Params> params( management::Get::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -267,7 +267,7 @@ bool ManagementGetFunction::RunImpl() { return true; } -bool ManagementGetPermissionWarningsByIdFunction::RunImpl() { +bool ManagementGetPermissionWarningsByIdFunction::RunSync() { scoped_ptr<management::GetPermissionWarningsById::Params> params( management::GetPermissionWarningsById::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -419,7 +419,7 @@ void ManagementGetPermissionWarningsByManifestFunction::OnParseFailure( Release(); } -bool ManagementLaunchAppFunction::RunImpl() { +bool ManagementLaunchAppFunction::RunSync() { scoped_ptr<management::LaunchApp::Params> params( management::LaunchApp::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/management/management_api.h b/chrome/browser/extensions/api/management/management_api.h index c62fa41..c2f26d9 100644 --- a/chrome/browser/extensions/api/management/management_api.h +++ b/chrome/browser/extensions/api/management/management_api.h @@ -42,7 +42,7 @@ class ManagementGetAllFunction : public ManagementFunction { virtual ~ManagementGetAllFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ManagementGetFunction : public ManagementFunction { @@ -53,7 +53,7 @@ class ManagementGetFunction : public ManagementFunction { virtual ~ManagementGetFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ManagementGetPermissionWarningsByIdFunction : public ManagementFunction { @@ -65,7 +65,7 @@ class ManagementGetPermissionWarningsByIdFunction : public ManagementFunction { virtual ~ManagementGetPermissionWarningsByIdFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ManagementGetPermissionWarningsByManifestFunction @@ -94,7 +94,7 @@ class ManagementLaunchAppFunction : public ManagementFunction { virtual ~ManagementLaunchAppFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ManagementSetEnabledFunction : public AsyncManagementFunction, diff --git a/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc b/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc index 6493f42..0b34444 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc +++ b/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc @@ -39,13 +39,13 @@ const size_t kMaxBuckets = 10000; // We don't ever want more than these many // and would cause crazy memory usage } // namespace -bool MetricsPrivateGetIsCrashReportingEnabledFunction::RunImpl() { +bool MetricsPrivateGetIsCrashReportingEnabledFunction::RunSync() { SetResult(new base::FundamentalValue( MetricsServiceHelper::IsCrashReportingEnabled())); return true; } -bool MetricsPrivateGetFieldTrialFunction::RunImpl() { +bool MetricsPrivateGetFieldTrialFunction::RunSync() { std::string name; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &name)); @@ -53,7 +53,7 @@ bool MetricsPrivateGetFieldTrialFunction::RunImpl() { return true; } -bool MetricsPrivateGetVariationParamsFunction::RunImpl() { +bool MetricsPrivateGetVariationParamsFunction::RunSync() { scoped_ptr<GetVariationParams::Params> params( GetVariationParams::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -69,7 +69,7 @@ bool MetricsPrivateGetVariationParamsFunction::RunImpl() { return true; } -bool MetricsPrivateRecordUserActionFunction::RunImpl() { +bool MetricsPrivateRecordUserActionFunction::RunSync() { scoped_ptr<RecordUserAction::Params> params( RecordUserAction::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -114,7 +114,7 @@ bool MetricsHistogramHelperFunction::RecordValue( return true; } -bool MetricsPrivateRecordValueFunction::RunImpl() { +bool MetricsPrivateRecordValueFunction::RunSync() { scoped_ptr<RecordValue::Params> params(RecordValue::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -129,7 +129,7 @@ bool MetricsPrivateRecordValueFunction::RunImpl() { params->metric.buckets, params->value); } -bool MetricsPrivateRecordSparseValueFunction::RunImpl() { +bool MetricsPrivateRecordSparseValueFunction::RunSync() { scoped_ptr<RecordSparseValue::Params> params( RecordSparseValue::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -139,7 +139,7 @@ bool MetricsPrivateRecordSparseValueFunction::RunImpl() { return true; } -bool MetricsPrivateRecordPercentageFunction::RunImpl() { +bool MetricsPrivateRecordPercentageFunction::RunSync() { scoped_ptr<RecordPercentage::Params> params( RecordPercentage::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -147,14 +147,14 @@ bool MetricsPrivateRecordPercentageFunction::RunImpl() { 1, 101, 102, params->value); } -bool MetricsPrivateRecordCountFunction::RunImpl() { +bool MetricsPrivateRecordCountFunction::RunSync() { scoped_ptr<RecordCount::Params> params(RecordCount::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); return RecordValue(params->metric_name, base::HISTOGRAM, 1, 1000000, 50, params->value); } -bool MetricsPrivateRecordSmallCountFunction::RunImpl() { +bool MetricsPrivateRecordSmallCountFunction::RunSync() { scoped_ptr<RecordSmallCount::Params> params( RecordSmallCount::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -162,7 +162,7 @@ bool MetricsPrivateRecordSmallCountFunction::RunImpl() { 1, 100, 50, params->value); } -bool MetricsPrivateRecordMediumCountFunction::RunImpl() { +bool MetricsPrivateRecordMediumCountFunction::RunSync() { scoped_ptr<RecordMediumCount::Params> params( RecordMediumCount::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -170,7 +170,7 @@ bool MetricsPrivateRecordMediumCountFunction::RunImpl() { 1, 10000, 50, params->value); } -bool MetricsPrivateRecordTimeFunction::RunImpl() { +bool MetricsPrivateRecordTimeFunction::RunSync() { scoped_ptr<RecordTime::Params> params(RecordTime::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); static const int kTenSecMs = 10 * 1000; @@ -178,7 +178,7 @@ bool MetricsPrivateRecordTimeFunction::RunImpl() { 1, kTenSecMs, 50, params->value); } -bool MetricsPrivateRecordMediumTimeFunction::RunImpl() { +bool MetricsPrivateRecordMediumTimeFunction::RunSync() { scoped_ptr<RecordMediumTime::Params> params( RecordMediumTime::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -187,7 +187,7 @@ bool MetricsPrivateRecordMediumTimeFunction::RunImpl() { 1, kThreeMinMs, 50, params->value); } -bool MetricsPrivateRecordLongTimeFunction::RunImpl() { +bool MetricsPrivateRecordLongTimeFunction::RunSync() { scoped_ptr<RecordLongTime::Params> params( RecordLongTime::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h index 8426416..42f9175 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h +++ b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h @@ -22,7 +22,7 @@ class MetricsPrivateGetIsCrashReportingEnabledFunction virtual ~MetricsPrivateGetIsCrashReportingEnabledFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateGetFieldTrialFunction : public SyncExtensionFunction { @@ -34,7 +34,7 @@ class MetricsPrivateGetFieldTrialFunction : public SyncExtensionFunction { virtual ~MetricsPrivateGetFieldTrialFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateGetVariationParamsFunction : public SyncExtensionFunction { @@ -46,7 +46,7 @@ class MetricsPrivateGetVariationParamsFunction : public SyncExtensionFunction { virtual ~MetricsPrivateGetVariationParamsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordUserActionFunction : public SyncExtensionFunction { @@ -58,7 +58,7 @@ class MetricsPrivateRecordUserActionFunction : public SyncExtensionFunction { virtual ~MetricsPrivateRecordUserActionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsHistogramHelperFunction : public SyncExtensionFunction { @@ -80,7 +80,7 @@ class MetricsPrivateRecordValueFunction virtual ~MetricsPrivateRecordValueFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordSparseValueFunction @@ -93,7 +93,7 @@ class MetricsPrivateRecordSparseValueFunction virtual ~MetricsPrivateRecordSparseValueFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordPercentageFunction @@ -106,7 +106,7 @@ class MetricsPrivateRecordPercentageFunction virtual ~MetricsPrivateRecordPercentageFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordCountFunction @@ -119,7 +119,7 @@ class MetricsPrivateRecordCountFunction virtual ~MetricsPrivateRecordCountFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordSmallCountFunction @@ -132,7 +132,7 @@ class MetricsPrivateRecordSmallCountFunction virtual ~MetricsPrivateRecordSmallCountFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordMediumCountFunction @@ -145,7 +145,7 @@ class MetricsPrivateRecordMediumCountFunction virtual ~MetricsPrivateRecordMediumCountFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordTimeFunction : public MetricsHistogramHelperFunction { @@ -157,7 +157,7 @@ class MetricsPrivateRecordTimeFunction : public MetricsHistogramHelperFunction { virtual ~MetricsPrivateRecordTimeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordMediumTimeFunction @@ -170,7 +170,7 @@ class MetricsPrivateRecordMediumTimeFunction virtual ~MetricsPrivateRecordMediumTimeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class MetricsPrivateRecordLongTimeFunction @@ -183,7 +183,7 @@ class MetricsPrivateRecordLongTimeFunction virtual ~MetricsPrivateRecordLongTimeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/module/module.cc b/chrome/browser/extensions/api/module/module.cc index 87b2d33..07e1f8a 100644 --- a/chrome/browser/extensions/api/module/module.cc +++ b/chrome/browser/extensions/api/module/module.cc @@ -36,7 +36,7 @@ std::string GetUpdateURLData(const ExtensionPrefs* prefs, } // namespace extension -bool ExtensionSetUpdateUrlDataFunction::RunImpl() { +bool ExtensionSetUpdateUrlDataFunction::RunSync() { std::string data; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &data)); @@ -51,13 +51,13 @@ bool ExtensionSetUpdateUrlDataFunction::RunImpl() { return true; } -bool ExtensionIsAllowedIncognitoAccessFunction::RunImpl() { +bool ExtensionIsAllowedIncognitoAccessFunction::RunSync() { SetResult(new base::FundamentalValue( util::IsIncognitoEnabled(extension_id(), GetProfile()))); return true; } -bool ExtensionIsAllowedFileSchemeAccessFunction::RunImpl() { +bool ExtensionIsAllowedFileSchemeAccessFunction::RunSync() { SetResult(new base::FundamentalValue( util::AllowFileAccess(extension_id(), GetProfile()))); return true; diff --git a/chrome/browser/extensions/api/module/module.h b/chrome/browser/extensions/api/module/module.h index 4f4af03..a6f00f4 100644 --- a/chrome/browser/extensions/api/module/module.h +++ b/chrome/browser/extensions/api/module/module.h @@ -25,7 +25,7 @@ class ExtensionSetUpdateUrlDataFunction : public ChromeSyncExtensionFunction { virtual ~ExtensionSetUpdateUrlDataFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ExtensionIsAllowedIncognitoAccessFunction @@ -38,7 +38,7 @@ class ExtensionIsAllowedIncognitoAccessFunction virtual ~ExtensionIsAllowedIncognitoAccessFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ExtensionIsAllowedFileSchemeAccessFunction @@ -51,7 +51,7 @@ class ExtensionIsAllowedFileSchemeAccessFunction virtual ~ExtensionIsAllowedFileSchemeAccessFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api.h b/chrome/browser/extensions/api/networking_private/networking_private_api.h index 26312b2..43057ee 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_api.h @@ -158,7 +158,7 @@ class NetworkingPrivateGetEnabledNetworkTypesFunction virtual ~NetworkingPrivateGetEnabledNetworkTypesFunction(); // SyncExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateGetEnabledNetworkTypesFunction); @@ -176,7 +176,7 @@ class NetworkingPrivateEnableNetworkTypeFunction virtual ~NetworkingPrivateEnableNetworkTypeFunction(); // SyncExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateEnableNetworkTypeFunction); @@ -194,7 +194,7 @@ class NetworkingPrivateDisableNetworkTypeFunction virtual ~NetworkingPrivateDisableNetworkTypeFunction(); // SyncExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateDisableNetworkTypeFunction); @@ -212,7 +212,7 @@ class NetworkingPrivateRequestNetworkScanFunction virtual ~NetworkingPrivateRequestNetworkScanFunction(); // SyncExtensionFunction overrides. - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateRequestNetworkScanFunction); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc index d904f64..4a015e6 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc @@ -317,7 +317,7 @@ NetworkingPrivateGetEnabledNetworkTypesFunction:: ~NetworkingPrivateGetEnabledNetworkTypesFunction() { } -bool NetworkingPrivateGetEnabledNetworkTypesFunction::RunImpl() { +bool NetworkingPrivateGetEnabledNetworkTypesFunction::RunSync() { NetworkStateHandler* state_handler = NetworkHandler::Get()->network_state_handler(); @@ -341,7 +341,7 @@ NetworkingPrivateEnableNetworkTypeFunction:: ~NetworkingPrivateEnableNetworkTypeFunction() { } -bool NetworkingPrivateEnableNetworkTypeFunction::RunImpl() { +bool NetworkingPrivateEnableNetworkTypeFunction::RunSync() { scoped_ptr<api::EnableNetworkType::Params> params = api::EnableNetworkType::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); @@ -380,7 +380,7 @@ NetworkingPrivateDisableNetworkTypeFunction:: ~NetworkingPrivateDisableNetworkTypeFunction() { } -bool NetworkingPrivateDisableNetworkTypeFunction::RunImpl() { +bool NetworkingPrivateDisableNetworkTypeFunction::RunSync() { scoped_ptr<api::DisableNetworkType::Params> params = api::DisableNetworkType::Params::Create(*args_); NetworkStateHandler* state_handler = @@ -419,7 +419,7 @@ NetworkingPrivateRequestNetworkScanFunction:: ~NetworkingPrivateRequestNetworkScanFunction() { } -bool NetworkingPrivateRequestNetworkScanFunction::RunImpl() { +bool NetworkingPrivateRequestNetworkScanFunction::RunSync() { NetworkHandler::Get()->network_state_handler()->RequestScan(); return true; } diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc index ec176f1..ad5edbe 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc @@ -248,7 +248,7 @@ NetworkingPrivateGetEnabledNetworkTypesFunction:: ~NetworkingPrivateGetEnabledNetworkTypesFunction() { } -bool NetworkingPrivateGetEnabledNetworkTypesFunction::RunImpl() { +bool NetworkingPrivateGetEnabledNetworkTypesFunction::RunSync() { base::ListValue* network_list = new base::ListValue; network_list->Append(new base::StringValue(onc::network_type::kWiFi)); SetResult(network_list); @@ -262,7 +262,7 @@ NetworkingPrivateEnableNetworkTypeFunction:: ~NetworkingPrivateEnableNetworkTypeFunction() { } -bool NetworkingPrivateEnableNetworkTypeFunction::RunImpl() { +bool NetworkingPrivateEnableNetworkTypeFunction::RunSync() { scoped_ptr<api::EnableNetworkType::Params> params = api::EnableNetworkType::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); @@ -276,7 +276,7 @@ NetworkingPrivateDisableNetworkTypeFunction:: ~NetworkingPrivateDisableNetworkTypeFunction() { } -bool NetworkingPrivateDisableNetworkTypeFunction::RunImpl() { +bool NetworkingPrivateDisableNetworkTypeFunction::RunSync() { scoped_ptr<api::DisableNetworkType::Params> params = api::DisableNetworkType::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); @@ -290,7 +290,7 @@ NetworkingPrivateRequestNetworkScanFunction:: ~NetworkingPrivateRequestNetworkScanFunction() { } -bool NetworkingPrivateRequestNetworkScanFunction::RunImpl() { +bool NetworkingPrivateRequestNetworkScanFunction::RunSync() { NetworkingPrivateServiceClient* service_client = NetworkingPrivateServiceClientFactory::GetForProfile(GetProfile()); service_client->RequestNetworkScan(); diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 588f50c..c72b999 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -266,7 +266,7 @@ void BrowserContextKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() { DependsOn(TemplateURLServiceFactory::GetInstance()); } -bool OmniboxSendSuggestionsFunction::RunImpl() { +bool OmniboxSendSuggestionsFunction::RunSync() { scoped_ptr<SendSuggestions::Params> params( SendSuggestions::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -279,7 +279,7 @@ bool OmniboxSendSuggestionsFunction::RunImpl() { return true; } -bool OmniboxSetDefaultSuggestionFunction::RunImpl() { +bool OmniboxSetDefaultSuggestionFunction::RunSync() { scoped_ptr<SetDefaultSuggestion::Params> params( SetDefaultSuggestion::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index d008abd..15d4926 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h @@ -80,7 +80,7 @@ class OmniboxSendSuggestionsFunction : public ChromeSyncExtensionFunction { virtual ~OmniboxSendSuggestionsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class OmniboxAPI : public BrowserContextKeyedAPI, @@ -159,7 +159,7 @@ class OmniboxSetDefaultSuggestionFunction : public ChromeSyncExtensionFunction { virtual ~OmniboxSetDefaultSuggestionFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // If the extension has set a custom default suggestion via diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index 4a3affb..162135e 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -48,7 +48,7 @@ bool ignore_user_gesture_for_tests = false; } // namespace -bool PermissionsContainsFunction::RunImpl() { +bool PermissionsContainsFunction::RunSync() { scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -64,14 +64,14 @@ bool PermissionsContainsFunction::RunImpl() { return true; } -bool PermissionsGetAllFunction::RunImpl() { +bool PermissionsGetAllFunction::RunSync() { scoped_ptr<Permissions> permissions = helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); results_ = GetAll::Results::Create(*permissions); return true; } -bool PermissionsRemoveFunction::RunImpl() { +bool PermissionsRemoveFunction::RunSync() { scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/chrome/browser/extensions/api/permissions/permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h index d0d1d39..43de8af 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.h +++ b/chrome/browser/extensions/api/permissions/permissions_api.h @@ -25,7 +25,7 @@ class PermissionsContainsFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsContainsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // chrome.permissions.getAll @@ -37,7 +37,7 @@ class PermissionsGetAllFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsGetAllFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // chrome.permissions.remove @@ -49,7 +49,7 @@ class PermissionsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~PermissionsRemoveFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // chrome.permissions.request diff --git a/chrome/browser/extensions/api/power/power_api.cc b/chrome/browser/extensions/api/power/power_api.cc index e82e4b5..0043147 100644 --- a/chrome/browser/extensions/api/power/power_api.cc +++ b/chrome/browser/extensions/api/power/power_api.cc @@ -9,7 +9,7 @@ namespace extensions { -bool PowerRequestKeepAwakeFunction::RunImpl() { +bool PowerRequestKeepAwakeFunction::RunSync() { scoped_ptr<api::power::RequestKeepAwake::Params> params( api::power::RequestKeepAwake::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -18,7 +18,7 @@ bool PowerRequestKeepAwakeFunction::RunImpl() { return true; } -bool PowerReleaseKeepAwakeFunction::RunImpl() { +bool PowerReleaseKeepAwakeFunction::RunSync() { PowerApiManager::GetInstance()->RemoveRequest(extension_id()); return true; } diff --git a/chrome/browser/extensions/api/power/power_api.h b/chrome/browser/extensions/api/power/power_api.h index 546ce93..6b12d2a 100644 --- a/chrome/browser/extensions/api/power/power_api.h +++ b/chrome/browser/extensions/api/power/power_api.h @@ -18,7 +18,7 @@ class PowerRequestKeepAwakeFunction : public SyncExtensionFunction { virtual ~PowerRequestKeepAwakeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // Implementation of the chrome.power.releaseKeepAwake API. @@ -30,7 +30,7 @@ class PowerReleaseKeepAwakeFunction : public SyncExtensionFunction { virtual ~PowerReleaseKeepAwakeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting.cc index 3c3aa2939..44d89b2 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting.cc @@ -29,7 +29,7 @@ bool DirectSettingFunctionBase::IsCalledFromComponentExtension() { GetDirectSettingFunction::GetDirectSettingFunction() {} -bool GetDirectSettingFunction::RunImpl() { +bool GetDirectSettingFunction::RunSync() { EXTENSION_FUNCTION_VALIDATE(IsCalledFromComponentExtension()); std::string pref_key; @@ -53,7 +53,7 @@ GetDirectSettingFunction::~GetDirectSettingFunction() {} SetDirectSettingFunction::SetDirectSettingFunction() {} -bool SetDirectSettingFunction::RunImpl() { +bool SetDirectSettingFunction::RunSync() { EXTENSION_FUNCTION_VALIDATE(IsCalledFromComponentExtension()); std::string pref_key; @@ -84,7 +84,7 @@ SetDirectSettingFunction::~SetDirectSettingFunction() {} ClearDirectSettingFunction::ClearDirectSettingFunction() {} -bool ClearDirectSettingFunction::RunImpl() { +bool ClearDirectSettingFunction::RunSync() { EXTENSION_FUNCTION_VALIDATE(IsCalledFromComponentExtension()); std::string pref_key; diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting.h b/chrome/browser/extensions/api/preference/chrome_direct_setting.h index 504bc66..c71432f 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting.h @@ -38,7 +38,7 @@ class GetDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: virtual ~GetDirectSettingFunction(); @@ -54,7 +54,7 @@ class SetDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: virtual ~SetDirectSettingFunction(); @@ -70,7 +70,7 @@ class ClearDirectSettingFunction : public DirectSettingFunctionBase { protected: // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: virtual ~ClearDirectSettingFunction(); diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 26a088f..2f9d89e 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -521,7 +521,7 @@ bool PreferenceFunction::ValidateBrowserPref( GetPreferenceFunction::~GetPreferenceFunction() { } -bool GetPreferenceFunction::RunImpl() { +bool GetPreferenceFunction::RunSync() { std::string pref_key; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); base::DictionaryValue* details = NULL; @@ -583,7 +583,7 @@ bool GetPreferenceFunction::RunImpl() { SetPreferenceFunction::~SetPreferenceFunction() { } -bool SetPreferenceFunction::RunImpl() { +bool SetPreferenceFunction::RunSync() { std::string pref_key; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); base::DictionaryValue* details = NULL; @@ -669,7 +669,7 @@ bool SetPreferenceFunction::RunImpl() { ClearPreferenceFunction::~ClearPreferenceFunction() { } -bool ClearPreferenceFunction::RunImpl() { +bool ClearPreferenceFunction::RunSync() { std::string pref_key; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); base::DictionaryValue* details = NULL; diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index f3fd881..abb7199 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h @@ -189,7 +189,7 @@ class GetPreferenceFunction : public PreferenceFunction { virtual ~GetPreferenceFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class SetPreferenceFunction : public PreferenceFunction { @@ -200,7 +200,7 @@ class SetPreferenceFunction : public PreferenceFunction { virtual ~SetPreferenceFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ClearPreferenceFunction : public PreferenceFunction { @@ -212,7 +212,7 @@ class ClearPreferenceFunction : public PreferenceFunction { virtual ~ClearPreferenceFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/principals_private/principals_private_api.cc b/chrome/browser/extensions/api/principals_private/principals_private_api.cc index a6ff8b6..75b90a6 100644 --- a/chrome/browser/extensions/api/principals_private/principals_private_api.cc +++ b/chrome/browser/extensions/api/principals_private/principals_private_api.cc @@ -13,16 +13,16 @@ namespace extensions { -bool PrincipalsPrivateExtensionFunction::RunImpl() { +bool PrincipalsPrivateExtensionFunction::RunSync() { if (!switches::IsNewProfileManagement()) { SetError( "Need to enable new-profile-management to use principalsPrivate API."); return false; } - return RunImplSafe(); + return RunSyncSafe(); } -bool PrincipalsPrivateSignOutFunction::RunImplSafe() { +bool PrincipalsPrivateSignOutFunction::RunSyncSafe() { Browser* browser = GetCurrentBrowser(); if (browser) { profiles::LockProfile(browser->profile()); @@ -30,7 +30,7 @@ bool PrincipalsPrivateSignOutFunction::RunImplSafe() { return true; } -bool PrincipalsPrivateShowAvatarBubbleFunction::RunImplSafe() { +bool PrincipalsPrivateShowAvatarBubbleFunction::RunSyncSafe() { Browser* browser = GetCurrentBrowser(); if (browser) { browser->window()->ShowAvatarBubbleFromAvatarButton( diff --git a/chrome/browser/extensions/api/principals_private/principals_private_api.h b/chrome/browser/extensions/api/principals_private/principals_private_api.h index 78f5981..eedb671 100644 --- a/chrome/browser/extensions/api/principals_private/principals_private_api.h +++ b/chrome/browser/extensions/api/principals_private/principals_private_api.h @@ -23,11 +23,11 @@ class PrincipalsPrivateExtensionFunction : public ChromeSyncExtensionFunction { // ExtensionFunction: // Checks for the flag "new-profile-management", if set calls - // RunImplSafe which must be overriden by subclasses. - virtual bool RunImpl() OVERRIDE FINAL; + // RunSyncSafe which must be overriden by subclasses. + virtual bool RunSync() OVERRIDE FINAL; private: - virtual bool RunImplSafe() = 0; + virtual bool RunSyncSafe() = 0; }; class PrincipalsPrivateSignOutFunction @@ -42,7 +42,7 @@ class PrincipalsPrivateSignOutFunction private: // PrincipalsPrivateExtensionFunction - virtual bool RunImplSafe() OVERRIDE; + virtual bool RunSyncSafe() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(PrincipalsPrivateSignOutFunction); }; @@ -59,7 +59,7 @@ class PrincipalsPrivateShowAvatarBubbleFunction private: // PrincipalsPrivateExtensionFunction - virtual bool RunImplSafe() OVERRIDE; + virtual bool RunSyncSafe() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(PrincipalsPrivateShowAvatarBubbleFunction); }; diff --git a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.cc b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.cc index 69af0893..605a648 100644 --- a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.cc +++ b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.cc @@ -47,7 +47,7 @@ bool ReadingListPrivateAddEntryFunction::RunImpl() { return true; } -bool ReadingListPrivateRemoveEntryFunction::RunImpl() { +bool ReadingListPrivateRemoveEntryFunction::RunSync() { scoped_ptr<RemoveEntry::Params> params(RemoveEntry::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); DomDistillerService* service = @@ -63,7 +63,7 @@ bool ReadingListPrivateRemoveEntryFunction::RunImpl() { return true; } -bool ReadingListPrivateGetEntriesFunction::RunImpl() { +bool ReadingListPrivateGetEntriesFunction::RunSync() { DomDistillerService* service = DomDistillerServiceFactory::GetForBrowserContext(GetProfile()); const std::vector<ArticleEntry>& entries = service->GetEntries(); diff --git a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h index 305da61..c88cb01 100644 --- a/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h +++ b/chrome/browser/extensions/api/reading_list_private/reading_list_private_api.h @@ -37,7 +37,7 @@ class ReadingListPrivateRemoveEntryFunction virtual ~ReadingListPrivateRemoveEntryFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class ReadingListPrivateGetEntriesFunction @@ -50,7 +50,7 @@ class ReadingListPrivateGetEntriesFunction virtual ~ReadingListPrivateGetEntriesFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/runtime/runtime_api.cc b/chrome/browser/extensions/api/runtime/runtime_api.cc index 49028e4..59ff72e 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api.cc @@ -499,7 +499,7 @@ void RuntimeGetBackgroundPageFunction::OnPageLoaded(ExtensionHost* host) { } } -bool RuntimeSetUninstallURLFunction::RunImpl() { +bool RuntimeSetUninstallURLFunction::RunSync() { std::string url_string; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url_string)); @@ -514,7 +514,7 @@ bool RuntimeSetUninstallURLFunction::RunImpl() { return true; } -bool RuntimeReloadFunction::RunImpl() { +bool RuntimeReloadFunction::RunSync() { RuntimeAPI::GetFactoryInstance()->Get(GetProfile())->MaybeReloadExtension( extension_id()); return true; @@ -592,7 +592,7 @@ void RuntimeRequestUpdateCheckFunction::ReplyUpdateFound( SendResponse(true); } -bool RuntimeRestartFunction::RunImpl() { +bool RuntimeRestartFunction::RunSync() { #if defined(OS_CHROMEOS) if (chromeos::UserManager::Get()->IsLoggedInAsKioskApp()) { chromeos::DBusThreadManager::Get() @@ -605,7 +605,7 @@ bool RuntimeRestartFunction::RunImpl() { return false; } -bool RuntimeGetPlatformInfoFunction::RunImpl() { +bool RuntimeGetPlatformInfoFunction::RunSync() { GetPlatformInfo::Results::PlatformInfo info; const char* os = chrome::OmahaQueryParams::GetOS(); @@ -654,7 +654,7 @@ bool RuntimeGetPlatformInfoFunction::RunImpl() { return true; } -bool RuntimeGetPackageDirectoryEntryFunction::RunImpl() { +bool RuntimeGetPackageDirectoryEntryFunction::RunSync() { fileapi::IsolatedContext* isolated_context = fileapi::IsolatedContext::GetInstance(); DCHECK(isolated_context); diff --git a/chrome/browser/extensions/api/runtime/runtime_api.h b/chrome/browser/extensions/api/runtime/runtime_api.h index b42ba9b..4bc411ce 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.h +++ b/chrome/browser/extensions/api/runtime/runtime_api.h @@ -142,7 +142,7 @@ class RuntimeSetUninstallURLFunction : public ChromeSyncExtensionFunction { protected: virtual ~RuntimeSetUninstallURLFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class RuntimeReloadFunction : public ChromeSyncExtensionFunction { @@ -151,7 +151,7 @@ class RuntimeReloadFunction : public ChromeSyncExtensionFunction { protected: virtual ~RuntimeReloadFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class RuntimeRequestUpdateCheckFunction : public ChromeAsyncExtensionFunction, @@ -183,7 +183,7 @@ class RuntimeRestartFunction : public ChromeSyncExtensionFunction { protected: virtual ~RuntimeRestartFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class RuntimeGetPlatformInfoFunction : public ChromeSyncExtensionFunction { @@ -192,7 +192,7 @@ class RuntimeGetPlatformInfoFunction : public ChromeSyncExtensionFunction { RUNTIME_GETPLATFORMINFO); protected: virtual ~RuntimeGetPlatformInfoFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class RuntimeGetPackageDirectoryEntryFunction @@ -203,7 +203,7 @@ class RuntimeGetPackageDirectoryEntryFunction protected: virtual ~RuntimeGetPackageDirectoryEntryFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc index 6ad2d90..1b7fc2d 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chrome/browser/extensions/api/sessions/sessions_api.cc @@ -195,7 +195,7 @@ scoped_ptr<api::sessions::Session> window.Pass()); } -bool SessionsGetRecentlyClosedFunction::RunImpl() { +bool SessionsGetRecentlyClosedFunction::RunSync() { scoped_ptr<GetRecentlyClosed::Params> params( GetRecentlyClosed::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -362,7 +362,7 @@ scoped_ptr<api::sessions::Device> SessionsGetDevicesFunction::CreateDeviceModel( return device_struct.Pass(); } -bool SessionsGetDevicesFunction::RunImpl() { +bool SessionsGetDevicesFunction::RunSync() { ProfileSyncService* service = ProfileSyncServiceFactory::GetInstance()->GetForProfile(GetProfile()); if (!(service && service->GetPreferredDataTypes().Has(syncer::SESSIONS))) { @@ -564,7 +564,7 @@ bool SessionsRestoreFunction::RestoreForeignSession(const SessionId& session_id, return SetResultRestoredWindow(ExtensionTabUtil::GetWindowId(browsers[0])); } -bool SessionsRestoreFunction::RunImpl() { +bool SessionsRestoreFunction::RunSync() { scoped_ptr<Restore::Params> params(Restore::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); diff --git a/chrome/browser/extensions/api/sessions/sessions_api.h b/chrome/browser/extensions/api/sessions/sessions_api.h index 49b00bb..f30d371 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.h +++ b/chrome/browser/extensions/api/sessions/sessions_api.h @@ -29,7 +29,7 @@ class SessionId; class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsGetRecentlyClosedFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("sessions.getRecentlyClosed", SESSIONS_GETRECENTLYCLOSED) @@ -47,7 +47,7 @@ class SessionsGetRecentlyClosedFunction : public ChromeSyncExtensionFunction { class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsGetDevicesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("sessions.getDevices", SESSIONS_GETDEVICES) private: @@ -68,7 +68,7 @@ class SessionsGetDevicesFunction : public ChromeSyncExtensionFunction { class SessionsRestoreFunction : public ChromeSyncExtensionFunction { protected: virtual ~SessionsRestoreFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("sessions.restore", SESSIONS_RESTORE) private: diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc index 434a2c8..a7a1d8a 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc @@ -99,7 +99,7 @@ scoped_ptr<DeviceInfo> GetLocalDeviceInfo(const std::string& extension_id, return device.Pass(); } -bool SignedInDevicesGetFunction::RunImpl() { +bool SignedInDevicesGetFunction::RunSync() { scoped_ptr<api::signed_in_devices::Get::Params> params( api::signed_in_devices::Get::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h index c45f3e9..c6f2643 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h @@ -42,7 +42,7 @@ class SignedInDevicesGetFunction : public ChromeSyncExtensionFunction { virtual ~SignedInDevicesGetFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("signedInDevices.get", SIGNED_IN_DEVICES_GET) }; diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc index a788cd7..f6bd637 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc @@ -340,7 +340,7 @@ void SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota( SendResponse(true); } -bool SyncFileSystemSetConflictResolutionPolicyFunction::RunImpl() { +bool SyncFileSystemSetConflictResolutionPolicyFunction::RunSync() { std::string policy_string; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &policy_string)); ConflictResolutionPolicy policy = ExtensionEnumToConflictResolutionPolicy( @@ -362,7 +362,7 @@ bool SyncFileSystemSetConflictResolutionPolicyFunction::RunImpl() { return true; } -bool SyncFileSystemGetConflictResolutionPolicyFunction::RunImpl() { +bool SyncFileSystemGetConflictResolutionPolicyFunction::RunSync() { sync_file_system::SyncFileSystemService* service = GetSyncFileSystemService(GetProfile()); DCHECK(service); @@ -374,7 +374,7 @@ bool SyncFileSystemGetConflictResolutionPolicyFunction::RunImpl() { return true; } -bool SyncFileSystemGetServiceStatusFunction::RunImpl() { +bool SyncFileSystemGetServiceStatusFunction::RunSync() { sync_file_system::SyncFileSystemService* service = GetSyncFileSystemService(GetProfile()); results_ = api::sync_file_system::GetServiceStatus::Results::Create( diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h index 68c9d78..e0e9621 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h @@ -126,7 +126,7 @@ class SyncFileSystemSetConflictResolutionPolicyFunction protected: virtual ~SyncFileSystemSetConflictResolutionPolicyFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class SyncFileSystemGetConflictResolutionPolicyFunction @@ -137,7 +137,7 @@ class SyncFileSystemGetConflictResolutionPolicyFunction protected: virtual ~SyncFileSystemGetConflictResolutionPolicyFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class SyncFileSystemGetServiceStatusFunction @@ -148,7 +148,7 @@ class SyncFileSystemGetServiceStatusFunction protected: virtual ~SyncFileSystemGetServiceStatusFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/system_display/system_display_api.cc b/chrome/browser/extensions/api/system_display/system_display_api.cc index 95074fa..faccf3d 100644 --- a/chrome/browser/extensions/api/system_display/system_display_api.cc +++ b/chrome/browser/extensions/api/system_display/system_display_api.cc @@ -24,14 +24,14 @@ namespace SetDisplayProperties = api::system_display::SetDisplayProperties; typedef std::vector<linked_ptr< api::system_display::DisplayUnitInfo> > DisplayInfo; -bool SystemDisplayGetInfoFunction::RunImpl() { +bool SystemDisplayGetInfoFunction::RunSync() { DisplayInfo all_displays_info = DisplayInfoProvider::Get()->GetAllDisplaysInfo(); results_ = api::system_display::GetInfo::Results::Create(all_displays_info); return true; } -bool SystemDisplaySetDisplayPropertiesFunction::RunImpl() { +bool SystemDisplaySetDisplayPropertiesFunction::RunSync() { #if !defined(OS_CHROMEOS) SetError("Function available only on ChromeOS."); return false; diff --git a/chrome/browser/extensions/api/system_display/system_display_api.h b/chrome/browser/extensions/api/system_display/system_display_api.h index 171cc2e..688adaa 100644 --- a/chrome/browser/extensions/api/system_display/system_display_api.h +++ b/chrome/browser/extensions/api/system_display/system_display_api.h @@ -18,7 +18,7 @@ class SystemDisplayGetInfoFunction : public SyncExtensionFunction { protected: virtual ~SystemDisplayGetInfoFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class SystemDisplaySetDisplayPropertiesFunction @@ -29,7 +29,7 @@ class SystemDisplaySetDisplayPropertiesFunction protected: virtual ~SystemDisplaySetDisplayPropertiesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc index 0ef4103..fcf84d1 100644 --- a/chrome/browser/extensions/api/system_private/system_private_api.cc +++ b/chrome/browser/extensions/api/system_private/system_private_api.cc @@ -62,7 +62,7 @@ namespace extensions { namespace system_private = api::system_private; -bool SystemPrivateGetIncognitoModeAvailabilityFunction::RunImpl() { +bool SystemPrivateGetIncognitoModeAvailabilityFunction::RunSync() { PrefService* prefs = GetProfile()->GetPrefs(); int value = prefs->GetInteger(prefs::kIncognitoModeAvailability); EXTENSION_FUNCTION_VALIDATE( @@ -72,7 +72,7 @@ bool SystemPrivateGetIncognitoModeAvailabilityFunction::RunImpl() { return true; } -bool SystemPrivateGetUpdateStatusFunction::RunImpl() { +bool SystemPrivateGetUpdateStatusFunction::RunSync() { std::string state; double download_progress = 0; #if defined(OS_CHROMEOS) @@ -133,7 +133,7 @@ bool SystemPrivateGetUpdateStatusFunction::RunImpl() { return true; } -bool SystemPrivateGetApiKeyFunction::RunImpl() { +bool SystemPrivateGetApiKeyFunction::RunSync() { SetResult(new base::StringValue(google_apis::GetAPIKey())); return true; } diff --git a/chrome/browser/extensions/api/system_private/system_private_api.h b/chrome/browser/extensions/api/system_private/system_private_api.h index ddb820b..e0d8d4c 100644 --- a/chrome/browser/extensions/api/system_private/system_private_api.h +++ b/chrome/browser/extensions/api/system_private/system_private_api.h @@ -22,7 +22,7 @@ class SystemPrivateGetIncognitoModeAvailabilityFunction virtual ~SystemPrivateGetIncognitoModeAvailabilityFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // API function which returns the status of system update. @@ -36,7 +36,7 @@ class SystemPrivateGetUpdateStatusFunction virtual ~SystemPrivateGetUpdateStatusFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // API function which returns the Google API key. @@ -48,7 +48,7 @@ class SystemPrivateGetApiKeyFunction : public SyncExtensionFunction { virtual ~SystemPrivateGetApiKeyFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // Dispatches systemPrivate.onBrightnessChanged event for extensions. diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc index 3c4872e..b5c9ffe 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc @@ -62,7 +62,7 @@ const char* whitelisted_extensions[] = { } // namespace -bool TabCaptureCaptureFunction::RunImpl() { +bool TabCaptureCaptureFunction::RunSync() { scoped_ptr<api::tab_capture::Capture::Params> params = TabCapture::Capture::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -163,7 +163,7 @@ bool TabCaptureCaptureFunction::RunImpl() { return true; } -bool TabCaptureGetCapturedTabsFunction::RunImpl() { +bool TabCaptureGetCapturedTabsFunction::RunSync() { extensions::TabCaptureRegistry* registry = extensions::TabCaptureRegistry::Get(GetProfile()); diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h index cac9e16..23c163c 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h @@ -22,7 +22,7 @@ class TabCaptureCaptureFunction : public ChromeSyncExtensionFunction { virtual ~TabCaptureCaptureFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction { @@ -34,7 +34,7 @@ class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction { virtual ~TabCaptureGetCapturedTabsFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 32d114d..e30904d 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -189,7 +189,7 @@ bool MatchesBool(bool* boolean, bool value) { // Windows --------------------------------------------------------------------- -bool WindowsGetFunction::RunImpl() { +bool WindowsGetFunction::RunSync() { scoped_ptr<windows::Get::Params> params(windows::Get::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -211,7 +211,7 @@ bool WindowsGetFunction::RunImpl() { return true; } -bool WindowsGetCurrentFunction::RunImpl() { +bool WindowsGetCurrentFunction::RunSync() { scoped_ptr<windows::GetCurrent::Params> params( windows::GetCurrent::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -233,7 +233,7 @@ bool WindowsGetCurrentFunction::RunImpl() { return true; } -bool WindowsGetLastFocusedFunction::RunImpl() { +bool WindowsGetLastFocusedFunction::RunSync() { scoped_ptr<windows::GetLastFocused::Params> params( windows::GetLastFocused::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -260,7 +260,7 @@ bool WindowsGetLastFocusedFunction::RunImpl() { return true; } -bool WindowsGetAllFunction::RunImpl() { +bool WindowsGetAllFunction::RunSync() { scoped_ptr<windows::GetAll::Params> params( windows::GetAll::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -334,7 +334,7 @@ bool WindowsCreateFunction::ShouldOpenIncognitoWindow( return incognito; } -bool WindowsCreateFunction::RunImpl() { +bool WindowsCreateFunction::RunSync() { scoped_ptr<windows::Create::Params> params( windows::Create::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -598,7 +598,7 @@ bool WindowsCreateFunction::RunImpl() { return true; } -bool WindowsUpdateFunction::RunImpl() { +bool WindowsUpdateFunction::RunSync() { scoped_ptr<windows::Update::Params> params( windows::Update::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -718,7 +718,7 @@ bool WindowsUpdateFunction::RunImpl() { return true; } -bool WindowsRemoveFunction::RunImpl() { +bool WindowsRemoveFunction::RunSync() { scoped_ptr<windows::Remove::Params> params( windows::Remove::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -740,7 +740,7 @@ bool WindowsRemoveFunction::RunImpl() { // Tabs ------------------------------------------------------------------------ -bool TabsGetSelectedFunction::RunImpl() { +bool TabsGetSelectedFunction::RunSync() { // windowId defaults to "current" window. int window_id = extension_misc::kCurrentWindowId; @@ -767,7 +767,7 @@ bool TabsGetSelectedFunction::RunImpl() { return true; } -bool TabsGetAllInWindowFunction::RunImpl() { +bool TabsGetAllInWindowFunction::RunSync() { scoped_ptr<tabs::GetAllInWindow::Params> params( tabs::GetAllInWindow::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -785,7 +785,7 @@ bool TabsGetAllInWindowFunction::RunImpl() { return true; } -bool TabsQueryFunction::RunImpl() { +bool TabsQueryFunction::RunSync() { scoped_ptr<tabs::Query::Params> params(tabs::Query::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -900,7 +900,7 @@ bool TabsQueryFunction::RunImpl() { return true; } -bool TabsCreateFunction::RunImpl() { +bool TabsCreateFunction::RunSync() { scoped_ptr<tabs::Create::Params> params(tabs::Create::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1038,7 +1038,7 @@ bool TabsCreateFunction::RunImpl() { return true; } -bool TabsDuplicateFunction::RunImpl() { +bool TabsDuplicateFunction::RunSync() { scoped_ptr<tabs::Duplicate::Params> params( tabs::Duplicate::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1081,7 +1081,7 @@ bool TabsDuplicateFunction::RunImpl() { return true; } -bool TabsGetFunction::RunImpl() { +bool TabsGetFunction::RunSync() { scoped_ptr<tabs::Get::Params> params(tabs::Get::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); int tab_id = params->tab_id; @@ -1106,7 +1106,7 @@ bool TabsGetFunction::RunImpl() { return true; } -bool TabsGetCurrentFunction::RunImpl() { +bool TabsGetCurrentFunction::RunSync() { DCHECK(dispatcher()); WebContents* contents = dispatcher()->delegate()->GetAssociatedWebContents(); @@ -1116,7 +1116,7 @@ bool TabsGetCurrentFunction::RunImpl() { return true; } -bool TabsHighlightFunction::RunImpl() { +bool TabsHighlightFunction::RunSync() { scoped_ptr<tabs::Highlight::Params> params( tabs::Highlight::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1370,7 +1370,7 @@ void TabsUpdateFunction::OnExecuteCodeFinished( SendResponse(error.empty()); } -bool TabsMoveFunction::RunImpl() { +bool TabsMoveFunction::RunSync() { scoped_ptr<tabs::Move::Params> params(tabs::Move::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1517,7 +1517,7 @@ bool TabsMoveFunction::MoveTab(int tab_id, return true; } -bool TabsReloadFunction::RunImpl() { +bool TabsReloadFunction::RunSync() { scoped_ptr<tabs::Reload::Params> params( tabs::Reload::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); @@ -1571,7 +1571,7 @@ bool TabsReloadFunction::RunImpl() { return true; } -bool TabsRemoveFunction::RunImpl() { +bool TabsRemoveFunction::RunSync() { scoped_ptr<tabs::Remove::Params> params(tabs::Remove::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h index 64743ac..605fcb9 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_api.h @@ -44,27 +44,27 @@ namespace extensions { // Windows class WindowsGetFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.get", WINDOWS_GET) }; class WindowsGetCurrentFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetCurrentFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.getCurrent", WINDOWS_GETCURRENT) }; class WindowsGetLastFocusedFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetLastFocusedFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.getLastFocused", WINDOWS_GETLASTFOCUSED) }; class WindowsGetAllFunction : public ChromeSyncExtensionFunction { virtual ~WindowsGetAllFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.getAll", WINDOWS_GETALL) }; class WindowsCreateFunction : public ChromeSyncExtensionFunction { virtual ~WindowsCreateFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; // Returns whether the window should be created in incognito mode. // |create_data| are the options passed by the extension. It may be NULL. // |urls| is the list of urls to open. If we are creating an incognito window, @@ -80,54 +80,54 @@ class WindowsCreateFunction : public ChromeSyncExtensionFunction { }; class WindowsUpdateFunction : public ChromeSyncExtensionFunction { virtual ~WindowsUpdateFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.update", WINDOWS_UPDATE) }; class WindowsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~WindowsRemoveFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("windows.remove", WINDOWS_REMOVE) }; // Tabs class TabsGetFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.get", TABS_GET) }; class TabsGetCurrentFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetCurrentFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.getCurrent", TABS_GETCURRENT) }; class TabsGetSelectedFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetSelectedFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.getSelected", TABS_GETSELECTED) }; class TabsGetAllInWindowFunction : public ChromeSyncExtensionFunction { virtual ~TabsGetAllInWindowFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.getAllInWindow", TABS_GETALLINWINDOW) }; class TabsQueryFunction : public ChromeSyncExtensionFunction { virtual ~TabsQueryFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.query", TABS_QUERY) }; class TabsCreateFunction : public ChromeSyncExtensionFunction { virtual ~TabsCreateFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.create", TABS_CREATE) }; class TabsDuplicateFunction : public ChromeSyncExtensionFunction { virtual ~TabsDuplicateFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.duplicate", TABS_DUPLICATE) }; class TabsHighlightFunction : public ChromeSyncExtensionFunction { virtual ~TabsHighlightFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; bool HighlightTab(TabStripModel* tabstrip, ui::ListSelectionModel* selection, int *active_index, @@ -158,7 +158,7 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction { }; class TabsMoveFunction : public ChromeSyncExtensionFunction { virtual ~TabsMoveFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; bool MoveTab(int tab_id, int* new_index, int iteration, @@ -168,12 +168,12 @@ class TabsMoveFunction : public ChromeSyncExtensionFunction { }; class TabsReloadFunction : public ChromeSyncExtensionFunction { virtual ~TabsReloadFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("tabs.reload", TABS_RELOAD) }; class TabsRemoveFunction : public ChromeSyncExtensionFunction { virtual ~TabsRemoveFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; bool RemoveTab(int tab_id); DECLARE_EXTENSION_FUNCTION("tabs.remove", TABS_REMOVE) }; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index f41c1b1..a1902e9 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -690,7 +690,7 @@ bool WebNavigationTabObserver::IsReferenceFragmentNavigation( url.ReplaceComponents(replacements); } -bool WebNavigationGetFrameFunction::RunImpl() { +bool WebNavigationGetFrameFunction::RunSync() { scoped_ptr<GetFrame::Params> params(GetFrame::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); int tab_id = params->details.tab_id; @@ -747,7 +747,7 @@ bool WebNavigationGetFrameFunction::RunImpl() { return true; } -bool WebNavigationGetAllFramesFunction::RunImpl() { +bool WebNavigationGetAllFramesFunction::RunSync() { scoped_ptr<GetAllFrames::Params> params(GetAllFrames::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); int tab_id = params->details.tab_id; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 49d70c0..d3aaf76 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -211,14 +211,14 @@ class WebNavigationEventRouter : public TabStripModelObserver, // API function that returns the state of a given frame. class WebNavigationGetFrameFunction : public ChromeSyncExtensionFunction { virtual ~WebNavigationGetFrameFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("webNavigation.getFrame", WEBNAVIGATION_GETFRAME) }; // API function that returns the states of all frames in a given tab. class WebNavigationGetAllFramesFunction : public ChromeSyncExtensionFunction { virtual ~WebNavigationGetAllFramesFunction() {} - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; DECLARE_EXTENSION_FUNCTION("webNavigation.getAllFrames", WEBNAVIGATION_GETALLFRAMES) }; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 1f77903..1b4fe41 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -2144,7 +2144,7 @@ void ClearCacheQuotaHeuristic::OnPageLoad(Bucket* bucket) { bucket->DeductToken(); } -bool WebRequestInternalAddEventListenerFunction::RunImpl() { +bool WebRequestInternalAddEventListenerFunction::RunSync() { // Argument 0 is the callback, which we don't use here. ExtensionWebRequestEventRouter::RequestFilter filter; base::DictionaryValue* value = NULL; @@ -2240,7 +2240,7 @@ void WebRequestInternalEventHandledFunction::RespondWithError( response.release()); } -bool WebRequestInternalEventHandledFunction::RunImpl() { +bool WebRequestInternalEventHandledFunction::RunSync() { std::string event_name; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name)); @@ -2420,7 +2420,7 @@ void WebRequestHandlerBehaviorChangedFunction::OnQuotaExceeded( Run(); } -bool WebRequestHandlerBehaviorChangedFunction::RunImpl() { +bool WebRequestHandlerBehaviorChangedFunction::RunSync() { helpers::ClearCacheOnNavigation(); return true; } diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h index 227d46b..8a2795b 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.h +++ b/chrome/browser/extensions/api/web_request/web_request_api.h @@ -477,7 +477,7 @@ class WebRequestInternalAddEventListenerFunction virtual ~WebRequestInternalAddEventListenerFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebRequestInternalEventHandledFunction @@ -501,7 +501,7 @@ class WebRequestInternalEventHandledFunction const std::string& error); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebRequestHandlerBehaviorChangedFunction @@ -519,7 +519,7 @@ class WebRequestHandlerBehaviorChangedFunction // Handle quota exceeded gracefully: Only warn the user but still execute the // function. virtual void OnQuotaExceeded(const std::string& error) OVERRIDE; - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; // Send updates to |host| with information about what webRequest-related diff --git a/chrome/browser/extensions/api/webcam_private/webcam_private_api.h b/chrome/browser/extensions/api/webcam_private/webcam_private_api.h index 132a211..869acc6 100644 --- a/chrome/browser/extensions/api/webcam_private/webcam_private_api.h +++ b/chrome/browser/extensions/api/webcam_private/webcam_private_api.h @@ -18,7 +18,7 @@ class WebcamPrivateSetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateSetFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateSetFunction); @@ -31,7 +31,7 @@ class WebcamPrivateGetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateGetFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateGetFunction); @@ -44,7 +44,7 @@ class WebcamPrivateResetFunction : public SyncExtensionFunction { protected: virtual ~WebcamPrivateResetFunction(); - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(WebcamPrivateResetFunction); diff --git a/chrome/browser/extensions/api/webcam_private/webcam_private_api_chromeos.cc b/chrome/browser/extensions/api/webcam_private/webcam_private_api_chromeos.cc index 21b7a18..1694e2f 100644 --- a/chrome/browser/extensions/api/webcam_private/webcam_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/webcam_private/webcam_private_api_chromeos.cc @@ -55,7 +55,7 @@ WebcamPrivateSetFunction::WebcamPrivateSetFunction() { WebcamPrivateSetFunction::~WebcamPrivateSetFunction() { } -bool WebcamPrivateSetFunction::RunImpl() { +bool WebcamPrivateSetFunction::RunSync() { // Get parameters scoped_ptr<api::webcam_private::Set::Params> params( api::webcam_private::Set::Params::Create(*args_)); @@ -92,7 +92,7 @@ WebcamPrivateGetFunction::WebcamPrivateGetFunction() { WebcamPrivateGetFunction::~WebcamPrivateGetFunction() { } -bool WebcamPrivateGetFunction::RunImpl() { +bool WebcamPrivateGetFunction::RunSync() { // Get parameters scoped_ptr<api::webcam_private::Get::Params> params( api::webcam_private::Get::Params::Create(*args_)); @@ -130,7 +130,7 @@ WebcamPrivateResetFunction::WebcamPrivateResetFunction() { WebcamPrivateResetFunction::~WebcamPrivateResetFunction() { } -bool WebcamPrivateResetFunction::RunImpl() { +bool WebcamPrivateResetFunction::RunSync() { // Get parameters scoped_ptr<api::webcam_private::Reset::Params> params( api::webcam_private::Reset::Params::Create(*args_)); diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 4df5896..85e051c 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -631,13 +631,13 @@ WebstorePrivateEnableAppLauncherFunction:: WebstorePrivateEnableAppLauncherFunction:: ~WebstorePrivateEnableAppLauncherFunction() {} -bool WebstorePrivateEnableAppLauncherFunction::RunImpl() { +bool WebstorePrivateEnableAppLauncherFunction::RunSync() { AppListService::Get(GetCurrentBrowser()->host_desktop_type()) ->EnableAppList(GetProfile(), AppListService::ENABLE_VIA_WEBSTORE_LINK); return true; } -bool WebstorePrivateGetBrowserLoginFunction::RunImpl() { +bool WebstorePrivateGetBrowserLoginFunction::RunSync() { GetBrowserLogin::Results::Info info; info.login = GetProfile()->GetOriginalProfile()->GetPrefs()->GetString( prefs::kGoogleServicesUsername); @@ -645,12 +645,12 @@ bool WebstorePrivateGetBrowserLoginFunction::RunImpl() { return true; } -bool WebstorePrivateGetStoreLoginFunction::RunImpl() { +bool WebstorePrivateGetStoreLoginFunction::RunSync() { results_ = GetStoreLogin::Results::Create(GetWebstoreLogin(GetProfile())); return true; } -bool WebstorePrivateSetStoreLoginFunction::RunImpl() { +bool WebstorePrivateSetStoreLoginFunction::RunSync() { scoped_ptr<SetStoreLogin::Params> params( SetStoreLogin::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params); @@ -684,12 +684,12 @@ void WebstorePrivateGetWebGLStatusFunction:: SendResponse(true); } -bool WebstorePrivateGetIsLauncherEnabledFunction::RunImpl() { +bool WebstorePrivateGetIsLauncherEnabledFunction::RunSync() { results_ = GetIsLauncherEnabled::Results::Create(IsAppLauncherEnabled()); return true; } -bool WebstorePrivateIsInIncognitoModeFunction::RunImpl() { +bool WebstorePrivateIsInIncognitoModeFunction::RunSync() { results_ = IsInIncognitoMode::Results::Create( GetProfile() != GetProfile()->GetOriginalProfile()); return true; diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h index 41306e6..6c6cd45 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h @@ -209,7 +209,7 @@ class WebstorePrivateEnableAppLauncherFunction virtual ~WebstorePrivateEnableAppLauncherFunction(); // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebstorePrivateGetBrowserLoginFunction @@ -222,7 +222,7 @@ class WebstorePrivateGetBrowserLoginFunction virtual ~WebstorePrivateGetBrowserLoginFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebstorePrivateGetStoreLoginFunction @@ -235,7 +235,7 @@ class WebstorePrivateGetStoreLoginFunction virtual ~WebstorePrivateGetStoreLoginFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebstorePrivateSetStoreLoginFunction @@ -248,7 +248,7 @@ class WebstorePrivateSetStoreLoginFunction virtual ~WebstorePrivateSetStoreLoginFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebstorePrivateGetWebGLStatusFunction @@ -285,7 +285,7 @@ class WebstorePrivateGetIsLauncherEnabledFunction virtual ~WebstorePrivateGetIsLauncherEnabledFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; private: void OnIsLauncherCheckCompleted(bool is_enabled); @@ -303,7 +303,7 @@ class WebstorePrivateIsInIncognitoModeFunction virtual ~WebstorePrivateIsInIncognitoModeFunction() {} // ExtensionFunction: - virtual bool RunImpl() OVERRIDE; + virtual bool RunSync() OVERRIDE; }; class WebstorePrivateSignInFunction : public ChromeAsyncExtensionFunction, diff --git a/chrome/browser/extensions/chrome_extension_function.cc b/chrome/browser/extensions/chrome_extension_function.cc index f7c6c59..24ccfc4 100644 --- a/chrome/browser/extensions/chrome_extension_function.cc +++ b/chrome/browser/extensions/chrome_extension_function.cc @@ -109,6 +109,9 @@ ChromeAsyncExtensionFunction::~ChromeAsyncExtensionFunction() {} ChromeSyncExtensionFunction::ChromeSyncExtensionFunction() {} -void ChromeSyncExtensionFunction::Run() { SendResponse(RunImpl()); } +bool ChromeSyncExtensionFunction::RunImpl() { + SendResponse(RunSync()); + return true; +} ChromeSyncExtensionFunction::~ChromeSyncExtensionFunction() {} diff --git a/chrome/browser/extensions/chrome_extension_function.h b/chrome/browser/extensions/chrome_extension_function.h index 07e7346..40fc539 100644 --- a/chrome/browser/extensions/chrome_extension_function.h +++ b/chrome/browser/extensions/chrome_extension_function.h @@ -68,7 +68,9 @@ class ChromeSyncExtensionFunction : public ChromeAsyncExtensionFunction { public: ChromeSyncExtensionFunction(); - virtual void Run() OVERRIDE; + virtual bool RunImpl() OVERRIDE; + + virtual bool RunSync() = 0; protected: virtual ~ChromeSyncExtensionFunction(); |