Add in DOMBrowserView and Frame related classes

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 454 matching lines @@
 #endif
 
   // We destroy the download shelf before |browser_| to remove its child
   // download views from the set of download observers (since the observed
   // downloads can be destroyed along with |browser_| and the observer
   // notifications will call back into deleted objects).
   download_shelf_.reset();
 
   // The TabStrip attaches a listener to the model. Make sure we shut down the
   // TabStrip first so that it can cleanly remove the listener.
-  tabstrip_->parent()->RemoveChildView(tabstrip_);
-  delete tabstrip_;
-  tabstrip_ = NULL;
-
+  if (tabstrip_) {
+    tabstrip_->parent()->RemoveChildView(tabstrip_);
+    delete tabstrip_;
+    tabstrip_ = NULL;
+  }
   // Child views maintain PrefMember attributes that point to
   // OffTheRecordProfile's PrefService which gets deleted by ~Browser.
   RemoveAllChildViews(true);
   // Explicitly set browser_ to NULL.
   browser_.reset();
 }
 
 // static
 BrowserView* BrowserView::GetBrowserViewForNativeWindow(
     gfx::NativeWindow window) {
@@ skipping 17 matching lines @@
   // Comment out for one cycle to see if this fixes dist tests.
   // tabstrip_->DestroyDragController();
 
   status_bubble_->Reposition();
 
   BrowserBubbleHost::WindowMoved();
 
   browser::HideBookmarkBubbleView();
 
   // Close the omnibox popup, if any.
-  if (toolbar_->location_bar())
-    toolbar_->location_bar()->location_entry()->ClosePopup();
+  if (toolbar_)
+    if (toolbar_->location_bar())

[oshima, 2011/03/14 20:09:22]

if (toolbar_ && toolbar_->location_bar())

[rharrison, 2011/03/15 22:01:21]

Done.

+      toolbar_->location_bar()->location_entry()->ClosePopup();
 }
 
 void BrowserView::WindowMoveOrResizeStarted() {
   TabContents* tab_contents = GetSelectedTabContents();
   if (tab_contents)
     tab_contents->WindowMoveOrResizeStarted();
 }
 
 gfx::Rect BrowserView::GetToolbarBounds() const {
   gfx::Rect toolbar_bounds(toolbar_->bounds());
@@ skipping 1126 matching lines @@
   if (active)
     BrowserList::SetLastActive(browser_.get());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, views::ClientView overrides:
 
 bool BrowserView::CanClose() {
   // You cannot close a frame for which there is an active originating drag
   // session.
-  if (!tabstrip_->IsTabStripCloseable())
-    return false;
+  if (tabstrip_)
+    if (!tabstrip_->IsTabStripCloseable())

[oshima, 2011/03/14 20:09:22]

if (tabstrip_ && ...)

[rharrison, 2011/03/15 22:01:21]

Done.

+      return false;
 
   // Give beforeunload handlers the chance to cancel the close before we hide
   // the window below.
   if (!browser_->ShouldCloseWindow())
     return false;
 
   if (!browser_->tabstrip_model()->empty()) {
     // Tab strip isn't empty.  Hide the frame (so it appears to have closed
     // immediately) and close all the tabs, allowing the renderers to shut
     // down. When the tab strip is empty we'll be called back again.
@@ skipping 137 matching lines @@
 void BrowserView::InitTabStrip(TabStripModel* model) {
   // Throw away the existing tabstrip if we're switching display modes.
   scoped_ptr<AbstractTabStripView> old_strip(tabstrip_);
   if (tabstrip_)
     tabstrip_->parent()->RemoveChildView(tabstrip_);
 
   tabstrip_ = CreateTabStrip(browser_.get(), model, UseVerticalTabs());
   AddChildView(tabstrip_);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// BrowserView, private:
+ToolbarView* BrowserView::CreateToolbar() const {
+  return new ToolbarView(browser_.get());
+}
 
 void BrowserView::Init() {
   SetLayoutManager(CreateLayoutManager());
   // Stow a pointer to this object onto the window handle so that we can get at
   // it later when all we have is a native view.
   GetWidget()->native_widget()->SetNativeWindowProperty(kBrowserViewKey, this);
 
   // Stow a pointer to the browser's profile onto the window handle so that we
   // can get it later when all we have is a native view.
   GetWidget()->native_widget()->SetNativeWindowProperty(Profile::kProfileKey,
                                                         browser_->profile());
 
   // Start a hung plugin window detector for this browser object (as long as
   // hang detection is not disabled).
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHangMonitor)) {
     InitHangMonitor();
   }
 
   LoadAccelerators();
 
   InitTabStrip(browser_->tabstrip_model());
 
-  toolbar_ = new ToolbarView(browser_.get());
-  AddChildView(toolbar_);
-  toolbar_->Init(browser_->profile());
+  SetToolbar(CreateToolbar());
 
   infobar_container_ = new InfoBarContainer(this);
   AddChildView(infobar_container_);
 
   contents_container_ = new TabContentsContainer;
   contents_ = new ContentsContainer(contents_container_);
 
   SkColor bg_color = GetWidget()->GetThemeProvider()->
       GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
 
@@ skipping 52 matching lines @@
     aeropeek_manager_.reset(new AeroPeekManager(
         frame_->GetWindow()->GetNativeWindow()));
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
 
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
 }
 
+void BrowserView::LoadingAnimationCallback() {
+  base::TimeTicks now = base::TimeTicks::Now();
+  if (!last_animation_time_.is_null()) {
+    UMA_HISTOGRAM_TIMES(
+        "Tabs.LoadingAnimationTime",
+        now - last_animation_time_);
+  }
+  last_animation_time_ = now;
+  if (browser_->type() == Browser::TYPE_NORMAL) {
+    // Loading animations are shown in the tab for tabbed windows.  We check the
+    // browser type instead of calling IsTabStripVisible() because the latter
+    // will return false for fullscreen windows, but we still need to update
+    // their animations (so that when they come out of fullscreen mode they'll
+    // be correct).
+    tabstrip_->UpdateLoadingAnimations();
+  } else if (ShouldShowWindowIcon()) {
+    // ... or in the window icon area for popups and app windows.
+    TabContents* tab_contents = browser_->GetSelectedTabContents();
+    // GetSelectedTabContents can return NULL for example under Purify when
+    // the animations are running slowly and this function is called on a timer
+    // through LoadingAnimationCallback.
+    frame_->UpdateThrobber(tab_contents && tab_contents->is_loading());
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// BrowserView, private:
+
 #if defined(OS_WIN)
 void BrowserView::InitSystemMenu() {
   system_menu_contents_.reset(new views::SystemMenuModel(this));
   // We add the menu items in reverse order so that insertion_index never needs
   // to change.
   if (IsBrowserTypeNormal())
     BuildSystemMenuForBrowserWindow();
   else
     BuildSystemMenuForAppOrPopupWindow(browser_->type() == Browser::TYPE_APP);
   system_menu_.reset(
@@ skipping 431 matching lines @@
     case APPCOMMAND_REDO:
     case APPCOMMAND_SPELL_CHECK:
     default:                          return -1;
   }
 #else
   // App commands are Windows-specific so there's nothing to do here.
   return -1;
 #endif
 }
 
-void BrowserView::LoadingAnimationCallback() {
-  base::TimeTicks now = base::TimeTicks::Now();
-  if (!last_animation_time_.is_null()) {
-    UMA_HISTOGRAM_TIMES(
-        "Tabs.LoadingAnimationTime",
-        now - last_animation_time_);
-  }
-  last_animation_time_ = now;
-  if (browser_->type() == Browser::TYPE_NORMAL) {
-    // Loading animations are shown in the tab for tabbed windows.  We check the
-    // browser type instead of calling IsTabStripVisible() because the latter
-    // will return false for fullscreen windows, but we still need to update
-    // their animations (so that when they come out of fullscreen mode they'll
-    // be correct).
-    tabstrip_->UpdateLoadingAnimations();
-  } else if (ShouldShowWindowIcon()) {
-    // ... or in the window icon area for popups and app windows.
-    TabContents* tab_contents = browser_->GetSelectedTabContents();
-    // GetSelectedTabContents can return NULL for example under Purify when
-    // the animations are running slowly and this function is called on a timer
-    // through LoadingAnimationCallback.
-    frame_->UpdateThrobber(tab_contents && tab_contents->is_loading());
-  }
-}
-
 void BrowserView::InitHangMonitor() {
 #if defined(OS_WIN)
   PrefService* pref_service = g_browser_process->local_state();
   if (!pref_service)
     return;
 
   int plugin_message_response_timeout =
       pref_service->GetInteger(prefs::kPluginMessageResponseTimeout);
   int hung_plugin_detect_freq =
       pref_service->GetInteger(prefs::kHungPluginDetectFrequency);
@@ skipping 105 matching lines @@
   // Update all the UI bits.
   UpdateTitleBar();
   // No need to update Toolbar because it's already updated in
   // browser.cc.
 }
 
 gfx::Size BrowserView::GetResizeCornerSize() const {
   return ResizeCorner::GetSize();
 }
 
+void BrowserView::SetToolbar(ToolbarView* toolbar) {
+  if (!toolbar)
+    return;

[oshima, 2011/03/14 20:09:22]

Can this happen? If not, use CHECK/DCHECK. If yes, who deletes the toolbar?

[rharrison, 2011/03/15 22:01:21]

Yes, since we override the function CreateToolbar that is used to generate the
value for this function, this method should be changed to be more robhust.

+  toolbar_ = toolbar;
+  AddChildView(toolbar_);
+  toolbar_->Init(browser_->profile());
+}
+
 #if !defined(OS_CHROMEOS)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   BrowserFrame::Create(view, browser->profile());
 
   view->GetWindow()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }