Attemp 2 at:

chrome/browser/views/frame/browser_view_layout.cc

 // Copyright (c) 2010 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/views/frame/browser_view_layout.h"
 
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ skipping 14 matching lines @@
 namespace {
 
 // The visible height of the shadow above the tabs. Clicks in this area are
 // treated as clicks to the frame, rather than clicks to the tab.
 const int kTabShadowSize = 2;
 // The vertical overlap between the TabStrip and the Toolbar.
 const int kToolbarTabStripVerticalOverlap = 3;
 // An offset distance between certain toolbars and the toolbar that preceded
 // them in layout.
 const int kSeparationLineHeight = 1;
-// Spacing between extension app icon and title.
-const int kExtensionAppIconTitleSpacing = 4;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserViewLayout, public:
 
 BrowserViewLayout::BrowserViewLayout()
-    : extension_app_icon_(NULL),
-      extension_app_title_(NULL),
-      tabstrip_(NULL),
+    : tabstrip_(NULL),
       toolbar_(NULL),
       contents_split_(NULL),
       contents_container_(NULL),
       infobar_container_(NULL),
       download_shelf_(NULL),
       extension_shelf_(NULL),
       active_bookmark_bar_(NULL),
       browser_view_(NULL),
       find_bar_y_(0) {
 }
@@ skipping 142 matching lines @@
 
 void BrowserViewLayout::Installed(views::View* host) {
   toolbar_ = NULL;
   contents_split_ = NULL;
   contents_container_ = NULL;
   infobar_container_ = NULL;
   download_shelf_ = NULL;
   extension_shelf_ = NULL;
   active_bookmark_bar_ = NULL;
   tabstrip_ = NULL;
-  extension_app_icon_ = NULL;
-  extension_app_title_ = NULL;
   browser_view_ = static_cast<BrowserView*>(host);
 }
 
 void BrowserViewLayout::Uninstalled(views::View* host) {}
 
 void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
   switch (view->GetID()) {
     case VIEW_ID_CONTENTS_SPLIT:
       contents_split_ = view;
       contents_container_ = contents_split_->GetChildViewAt(0);
       break;
     case VIEW_ID_INFO_BAR_CONTAINER:
       infobar_container_ = view;
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
       download_shelf_ = static_cast<DownloadShelfView*>(view);
       break;
     case VIEW_ID_DEV_EXTENSION_SHELF:
       extension_shelf_ = static_cast<ExtensionShelf*>(view);
       break;
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = static_cast<BookmarkBarView*>(view);
       break;
     case VIEW_ID_TOOLBAR:
       toolbar_ = static_cast<ToolbarView*>(view);
       break;
     case VIEW_ID_TAB_STRIP:
       tabstrip_ = static_cast<BaseTabStrip*>(view);
       break;
-    case VIEW_ID_EXTENSION_APP_ICON:
-      extension_app_icon_ = static_cast<views::ImageView*>(view);
-      break;
-    case VIEW_ID_EXTENSION_APP_TITLE:
-      extension_app_title_ = static_cast<views::Label*>(view);
-      break;
   }
 }
 
 void BrowserViewLayout::ViewRemoved(views::View* host, views::View* view) {
   switch (view->GetID()) {
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = NULL;
       break;
   }
 }
 
 void BrowserViewLayout::Layout(views::View* host) {
   vertical_layout_rect_ = browser_view_->GetLocalBounds(true);
-  LayoutExtensionAppIconAndTitle();
   int top = LayoutTabStrip();
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
   int bottom = LayoutExtensionAndDownloadShelves();
   LayoutTabContents(top, bottom);
   // This must be done _after_ we lay out the TabContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
   if (browser()->HasFindBarController()) {
     browser()->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
         gfx::Rect(), true);
   }
   // Align status bubble with the bottom of the contents_container.
   browser_view_->LayoutStatusBubble(
       top + contents_container_->bounds().height());
   browser_view_->SchedulePaint();
 }
 
 // Return the preferred size which is the size required to give each
 // children their respective preferred size.
 gfx::Size BrowserViewLayout::GetPreferredSize(views::View* host) {
   return gfx::Size();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BrowserViewLayout, private:
 
-void BrowserViewLayout::LayoutExtensionAppIconAndTitle() {
-  if (browser_view_->browser()->type() != Browser::TYPE_EXTENSION_APP)
-    return;
-
-  extension_app_icon_->SetVisible(true);
-  extension_app_icon_->SetBounds(0, 0, Extension::EXTENSION_ICON_SMALL,
-                                 Extension::EXTENSION_ICON_SMALL);
-
-  extension_app_title_->SetVisible(true);
-
-  // Position the title vertically centered with the icon and slightly to its
-  // right.
-  extension_app_title_->SetX(
-      extension_app_icon_->x() + extension_app_icon_->width() +
-      kExtensionAppIconTitleSpacing);
-  extension_app_title_->SetY(
-      extension_app_icon_->y() +
-      ((extension_app_icon_->height() - extension_app_title_->height()) / 2));
-}
-
 int BrowserViewLayout::LayoutTabStrip() {
   if (!browser_view_->IsTabStripVisible()) {
     tabstrip_->SetVisible(false);
     tabstrip_->SetBounds(0, 0, 0, 0);
     return 0;
   }
   gfx::Rect layout_bounds =
       browser_view_->frame()->GetBoundsForTabStrip(tabstrip_);
 
   if (browser_view_->UseVerticalTabs()) {
@@ skipping 18 matching lines @@
 
 int BrowserViewLayout::LayoutToolbar(int top) {
   int browser_view_width = vertical_layout_rect_.width();
   bool visible = browser_view_->IsToolbarVisible();
   toolbar_->location_bar()->SetFocusable(visible);
   int y = top;
   if (!browser_view_->UseVerticalTabs()) {
     y -= ((visible && browser_view_->IsTabStripVisible()) ?
           kToolbarTabStripVerticalOverlap : 0);
   }
-
-  int height = 0;
-  if (visible) {
-    height = toolbar_->GetPreferredSize().height();
-    toolbar_->SetVisible(true);
-  } else {
-    toolbar_->SetVisible(false);
-  }
-
+  int height = visible ? toolbar_->GetPreferredSize().height() : 0;
+  toolbar_->SetVisible(visible);
   toolbar_->SetBounds(vertical_layout_rect_.x(), y, browser_view_width, height);
   return y + height;
 }
 
 int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top) {
   find_bar_y_ = top + browser_view_->y() - 1;
   if (active_bookmark_bar_) {
     // If we're showing the Bookmark bar in detached style, then we
     // need to show any Info bar _above_ the Bookmark bar, since the
     // Bookmark bar is styled to look like it's part of the page.
@@ skipping 86 matching lines @@
     int height =
         visible ? extension_shelf_->GetPreferredSize().height() : 0;
     extension_shelf_->SetVisible(visible && height != 0);
     extension_shelf_->SetBounds(vertical_layout_rect_.x(), bottom - height,
                                 vertical_layout_rect_.width(), height);
     extension_shelf_->Layout();
     bottom -= height;
   }
   return bottom;
 }