diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 18:24:53 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 18:24:53 +0000 |
| commit | 9155324b8d7e4b465553e42366319a4e1587ac20 (patch) | |
| tree | 6faecbce10a5163ab46782cf654e49c937ce6e1a /chrome/browser/extensions | |
| parent | c60bf3db722742386dcf4f8c9dc86e7a812688b7 (diff) | |
| download | chromium_src-9155324b8d7e4b465553e42366319a4e1587ac20.zip chromium_src-9155324b8d7e4b465553e42366319a4e1587ac20.tar.gz chromium_src-9155324b8d7e4b465553e42366319a4e1587ac20.tar.bz2 | |
Revert 54560 -
Change removing method, GetBrowser from TabContentsDelegate, as this was breaking an abstraction layer. This routine was originally added in CL 434046, which required the Browser* to construct extension popup views from within Chrome-Frame instances.
I changed all accesses to Browser instances from usage of the above method, to either iterating the BrowserList using the situation-specific profile as a search key, or modifying the appropriate delegate interfaces to provide the functionality that was previously used directly via the Browser.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/2941001
TBR=twiz@google.com
Review URL: http://codereview.chromium.org/3012042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_dom_ui.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index 550f45f..7cbe08f 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -176,9 +176,12 @@ void ExtensionDOMUI::ProcessDOMUIMessage(const std::string& message, } Browser* ExtensionDOMUI::GetBrowser() const { - // TODO(beng): This is an improper direct dependency on Browser. Route this - // through some sort of delegate. - return BrowserList::FindBrowserWithProfile(DOMUI::GetProfile()); + Browser* browser = NULL; + TabContentsDelegate* tab_contents_delegate = tab_contents()->delegate(); + if (tab_contents_delegate) + browser = tab_contents_delegate->GetBrowser(); + + return browser; } Profile* ExtensionDOMUI::GetProfile() { |