CompactNavigationBar for toolkit views build, with some design change per Cole's request.

chrome/browser/chromeos/compact_navigation_bar.cc

 // Copyright (c) 2009 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/chromeos/compact_navigation_bar.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 // Draw this much white around the URL bar to make it look larger than it
 // actually is.
 static const int kURLPadding = 2;
 
 CompactNavigationBar::CompactNavigationBar(Browser* browser)
     : browser_(browser),
       initialized_(false) {
 }
 
 CompactNavigationBar::~CompactNavigationBar() {
-  location_entry_view_->Detach();
+  if (location_entry_view_->native_view())
+    location_entry_view_->Detach();
 }
 
 void CompactNavigationBar::Init() {
   DCHECK(!initialized_);
   initialized_ = true;
 
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
 
   back_button_ = new views::ImageButton(this);
   back_button_->SetImage(views::CustomButton::BS_NORMAL,
@@ skipping 39 matching lines @@
       kInnerPadding * 2;
 
   width++;
   return gfx::Size(width, kPreferredHeight);
 }
 
 void CompactNavigationBar::Layout() {
   if (!initialized_)
     return;
 
-  int curx = 0;
+  // We hide navigation buttons when the entry has focus.  Navigation
+  // buttons' visibility is controlled in OnKillFocus/OnSetFocus methods.
+  if (!back_button_->IsVisible()) {
+    // Fill the view with the entry view while it has focus.
+    location_entry_view_->SetBounds(kURLPadding, 0,
+                                    width() - kHorizPadding, height());
+  } else {
+    // Layout forward/back buttons after entry views as follows:
+    // [Entry View] [Back]|[Forward]
+    int curx = 0;
+    // URL bar.
+    location_entry_view_->SetBounds(curx + kURLPadding, 0,
+                                    kURLWidth + kURLPadding * 2, height());
+    curx += kURLWidth + kHorizPadding + kURLPadding * 2;
 
-  // "Back | Forward" section.
-  gfx::Size button_size = back_button_->GetPreferredSize();
-  button_size.set_width(button_size.width() + kInnerPadding * 2);
-  back_button_->SetBounds(curx, 0, button_size.width(), height());
-  curx += button_size.width() + kHorizPadding;
+    // "Back | Forward" section.
+    gfx::Size button_size = back_button_->GetPreferredSize();
+    button_size.set_width(button_size.width() + kInnerPadding * 2);
+    back_button_->SetBounds(curx, 0, button_size.width(), height());
+    curx += button_size.width() + kHorizPadding;
 
-  button_size = bf_separator_->GetPreferredSize();
-  bf_separator_->SetBounds(curx, 0, button_size.width(), height());
-  curx += button_size.width() + kHorizPadding;
+    button_size = bf_separator_->GetPreferredSize();
+    bf_separator_->SetBounds(curx, 0, button_size.width(), height());
+    curx += button_size.width() + kHorizPadding;
 
-  button_size = forward_button_->GetPreferredSize();
-  button_size.set_width(button_size.width() + kInnerPadding * 2);
-  forward_button_->SetBounds(curx, 0, button_size.width(), height());
-  curx += button_size.width() + kHorizPadding;
-
-  // URL bar.
-  location_entry_view_->SetBounds(curx + kURLPadding, 0,
-                                  kURLWidth + kURLPadding * 2, height());
-  curx += kURLWidth + kHorizPadding + kURLPadding * 2;
+    button_size = forward_button_->GetPreferredSize();
+    button_size.set_width(button_size.width() + kInnerPadding * 2);
+    forward_button_->SetBounds(curx, 0, button_size.width(), height());
+    curx += button_size.width() + kHorizPadding;
+  }
 }
 
 void CompactNavigationBar::Paint(gfx::Canvas* canvas) {
   ThemeProvider* theme = browser_->profile()->GetThemeProvider();
 
   // Fill the background.
   int image_name;
   if (browser_->window()->IsActive()) {
     image_name = browser_->profile()->IsOffTheRecord() ?
                  IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME;
@@ skipping 39 matching lines @@
   AddTabWithURL(url, transition);
 }
 
 void CompactNavigationBar::OnChanged() {
   // Other one does "DoLayout" here.
 }
 
 void CompactNavigationBar::OnInputInProgress(bool in_progress) {
 }
 
+void CompactNavigationBar::OnKillFocus() {
+  back_button_->SetVisible(true);
+  bf_separator_->SetVisible(true);
+  forward_button_->SetVisible(true);
+  Layout();
+  SchedulePaint();
+}
+
 void CompactNavigationBar::OnSetFocus() {
+  back_button_->SetVisible(false);
+  bf_separator_->SetVisible(false);
+  forward_button_->SetVisible(false);
+  Layout();
+  SchedulePaint();
 }
 
 SkBitmap CompactNavigationBar::GetFavIcon() const {
   return SkBitmap();
 }
 
 std::wstring CompactNavigationBar::GetTitle() const {
   return std::wstring();
 }
 
@@ skipping 17 matching lines @@
       browser_->GetSelectedTabContents()->controller().LoadURL(
           url, GURL(), transition);
       break;
     }
     case StatusAreaView::OPEN_TABS_ON_RIGHT: {
       browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
       break;
     }
   }
 }