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/dom_ui/history2_ui.cc | |
| 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/dom_ui/history2_ui.cc')
| -rw-r--r-- | chrome/browser/dom_ui/history2_ui.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index 2ac33ea..067fec3 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -17,7 +17,6 @@ #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" #include "chrome/browser/metrics/user_metrics.h" @@ -236,11 +235,8 @@ void BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay(const Value* value) { } void BrowsingHistoryHandler2::HandleClearBrowsingData(const Value* value) { - // TODO(beng): This is an improper direct dependency on Browser. Route this - // through some sort of delegate. - Browser* browser = BrowserList::FindBrowserWithProfile(dom_ui_->GetProfile()); - if (browser) - browser->OpenClearBrowsingDataDialog(); + dom_ui_->tab_contents()->delegate()->GetBrowser()-> + OpenClearBrowsingDataDialog(); } void BrowsingHistoryHandler2::QueryComplete( |