summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 00:26:18 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 00:26:18 +0000
commitda5ff696c0007cdb6ded17a9d4fecf6d4294993e (patch)
tree278bc8929945622ea13b26a1d9939d460721b949 /chrome/browser/browser.cc
parent1ca6df9ae9d23bffa27bb1f5fd19a79a6621939a (diff)
downloadchromium_src-da5ff696c0007cdb6ded17a9d4fecf6d4294993e.zip
chromium_src-da5ff696c0007cdb6ded17a9d4fecf6d4294993e.tar.gz
chromium_src-da5ff696c0007cdb6ded17a9d4fecf6d4294993e.tar.bz2
Move the BookmarkBarView into the frames.
Yes this causes duplicate code, but only for a brief while until I can bring up BrowserView at which point this code will move from the frames to that object. "It gets worse before it gets better". B=1031854 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index cec09dd..4b4ddb2 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -303,10 +303,6 @@ Browser::~Browser() {
RemoveObserver(this, NOTIFY_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
NotificationService::AllSources());
- ChromeViews::View* p;
- if (bookmark_bar_view_.get() && (p = bookmark_bar_view_->GetParent()))
- p->RemoveChildView(bookmark_bar_view_.get());
-
// Stop hung plugin monitoring.
ticker_.Stop();
ticker_.UnregisterTickHandler(&hung_window_detector_);
@@ -915,19 +911,6 @@ bool Browser::ShouldDisplayURLField() {
return !IsApplication();
}
-BookmarkBarView* Browser::GetBookmarkBarView() {
- TabContents* current_tab = GetSelectedTabContents();
- if (!current_tab || !current_tab->profile())
- return NULL;
-
- if (!bookmark_bar_view_.get())
- bookmark_bar_view_.reset(new BookmarkBarView(current_tab->profile(), this));
- else
- bookmark_bar_view_->SetProfile(current_tab->profile());
- bookmark_bar_view_->SetPageNavigator(current_tab);
- return bookmark_bar_view_.get();
-}
-
void Browser::SaveWindowPlacementToDatabase() {
// We don't want to be the ones who cause lazy initialization of the session
// service. This function gets called during initial window showing, and we