diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 14:58:18 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 14:58:18 +0000 |
| commit | afac6fe84c150e64339e3c71b460f05d9415ae5b (patch) | |
| tree | eecd23fb1badb76714ac3d1b094db1bc6303bcc2 /chrome/browser/extensions/extension_function_dispatcher.cc | |
| parent | 08513e45ac4e0e351cfb426aa78cb66de8a8819e (diff) | |
| download | chromium_src-afac6fe84c150e64339e3c71b460f05d9415ae5b.zip chromium_src-afac6fe84c150e64339e3c71b460f05d9415ae5b.tar.gz chromium_src-afac6fe84c150e64339e3c71b460f05d9415ae5b.tar.bz2 | |
make extension apis tolerate browser absence during start-up & shutdown
Note: I was never able to directly reproduce the 13082 bug, the error mode is clear (there was no selected tab during a call to tabs.getSelected()). This fix will address that issue and we should stop seeing this crash reports.
R=erikkay
BUG=13082
Review URL: http://codereview.chromium.org/119117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function_dispatcher.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_function_dispatcher.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index dc5c8f1..93a34db 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -68,7 +68,7 @@ void FactoryRegistry::ResetFunctions() { namespace bookmarks = extension_bookmarks_module_constants; // Windows - factories_[tabs::kGetWindowFunction] = + factories_[tabs::kGetWindowFunction] = &NewExtensionFunction<GetWindowFunction>; factories_[tabs::kGetCurrentWindowFunction] = &NewExtensionFunction<GetCurrentWindowFunction>; @@ -76,27 +76,27 @@ void FactoryRegistry::ResetFunctions() { &NewExtensionFunction<GetLastFocusedWindowFunction>; factories_[tabs::kGetAllWindowsFunction] = &NewExtensionFunction<GetAllWindowsFunction>; - factories_[tabs::kCreateWindowFunction] = + factories_[tabs::kCreateWindowFunction] = &NewExtensionFunction<CreateWindowFunction>; - factories_[tabs::kUpdateWindowFunction] = + factories_[tabs::kUpdateWindowFunction] = &NewExtensionFunction<UpdateWindowFunction>; - factories_[tabs::kRemoveWindowFunction] = + factories_[tabs::kRemoveWindowFunction] = &NewExtensionFunction<RemoveWindowFunction>; // Tabs - factories_[tabs::kGetTabFunction] = + factories_[tabs::kGetTabFunction] = &NewExtensionFunction<GetTabFunction>; factories_[tabs::kGetSelectedTabFunction] = &NewExtensionFunction<GetSelectedTabFunction>; factories_[tabs::kGetAllTabsInWindowFunction] = &NewExtensionFunction<GetAllTabsInWindowFunction>; - factories_[tabs::kCreateTabFunction] = + factories_[tabs::kCreateTabFunction] = &NewExtensionFunction<CreateTabFunction>; - factories_[tabs::kUpdateTabFunction] = + factories_[tabs::kUpdateTabFunction] = &NewExtensionFunction<UpdateTabFunction>; - factories_[tabs::kMoveTabFunction] = + factories_[tabs::kMoveTabFunction] = &NewExtensionFunction<MoveTabFunction>; - factories_[tabs::kRemoveTabFunction] = + factories_[tabs::kRemoveTabFunction] = &NewExtensionFunction<RemoveTabFunction>; // Page Actions. @@ -185,7 +185,6 @@ Browser* ExtensionFunctionDispatcher::GetBrowser() { DCHECK(delegate_); Browser* retval = delegate_->GetBrowser(); - DCHECK(retval); return retval; } |