summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container_win.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 19:22:34 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 19:22:34 +0000
commit1e785fe7c5017f6ec297906f54066b4d8fb21ca4 (patch)
treec9821657333a13c4cb420aa247d204cae198304a /chrome/browser/external_tab_container_win.h
parentefdd4bf2f05461e45df5703852f8c0eaa5becc95 (diff)
downloadchromium_src-1e785fe7c5017f6ec297906f54066b4d8fb21ca4.zip
chromium_src-1e785fe7c5017f6ec297906f54066b4d8fb21ca4.tar.gz
chromium_src-1e785fe7c5017f6ec297906f54066b4d8fb21ca4.tar.bz2
Fix the case where the TabContents goes away before TabContentsObserver::Registrar.
BUG=84584 Review URL: http://codereview.chromium.org/7080061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.h')
-rw-r--r--chrome/browser/external_tab_container_win.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h
index 55de8cb..d8ac9d3 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "content/browser/tab_contents/tab_contents_observer.h"
+#include "content/browser/tab_contents/tab_contents_observer_registrar.h"
#include "content/common/navigation_types.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
@@ -275,7 +276,7 @@ class ExternalTabContainer : public TabContentsDelegate,
NotificationRegistrar registrar_;
- TabContentsObserver::Registrar tab_contents_registrar_;
+ TabContentsObserverRegistrar tab_contents_registrar_;
// A view to handle focus cycling
TabContentsContainer* tab_contents_container_;