Compact Navigation prototype

chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc

Index: chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc
diff --git a/chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc b/chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc
new file mode 100755
index 0000000000000000000000000000000000000000..48d2a0290087a0b4d84a3903041be74e94700773
--- /dev/null
+++ b/chrome/browser/ui/views/compact_nav/compact_navigation_bar.cc
@@ -0,0 +1,182 @@
+// 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/compact_nav/compact_navigation_bar.h"
+
+#include "base/logging.h"
+#include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
+#include "chrome/browser/ui/view_ids.h"
+#include "chrome/browser/ui/views/event_utils.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/theme_background.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/theme_provider.h"
+#include "ui/gfx/canvas.h"
+#include "views/controls/button/button_dropdown.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/native/native_view_host.h"
+
+// Padding inside each button around the image.
+static const int kInnerPadding = 1;
+
+// Spacing between buttons (excluding left/right most margin)
+static const int kHorizMargin = 3;
+
+// Left side margin of the back button to align with the main menu.
+static const int kBackButtonLeftMargin = 10;
+
+// Right side margin of the forward button to align with the main menu.
+static const int kForwardButtonRightMargin = 1;
+
+// Preferred height.
+static const int kPreferredHeight = 25;
+
+////////////////////////////////////////////////////////////////////////////////
+// CompactNavigationBar public:
+
+CompactNavigationBar::CompactNavigationBar(::BrowserView* browser_view)
+    : browser_view_(browser_view),
+      initialized_(false) {

[sky, 2011/05/03 18:38:32]

initialize back_, bf_separator_ and forward_ too.

[SteveT, 2011/05/06 18:48:43]

Done.

+}
+
+CompactNavigationBar::~CompactNavigationBar() {
+}
+
+void CompactNavigationBar::Init() {
+  DCHECK(!initialized_);
+  initialized_ = true;
+  Browser* browser = browser_view_->browser();
+  browser->command_updater()->AddCommandObserver(IDC_BACK, this);
+  browser->command_updater()->AddCommandObserver(IDC_FORWARD, this);

[sky, 2011/05/03 18:38:32]

I don't see you removing the observers.

[SteveT, 2011/05/06 18:48:43]

Added Remove calls to the dtor. Moved the AddCommandObserver calls to the ctor
for symmetry.

+
+  back_menu_model_.reset(new BackForwardMenuModel(
+      browser, BackForwardMenuModel::BACKWARD_MENU));
+  forward_menu_model_.reset(new BackForwardMenuModel(
+      browser, BackForwardMenuModel::FORWARD_MENU));
+
+  ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
+
+  back_ = new views::ButtonDropDown(this, back_menu_model_.get());
+  back_->set_triggerable_event_flags(ui::EF_LEFT_BUTTON_DOWN |
+                                     ui::EF_MIDDLE_BUTTON_DOWN);
+  back_->set_tag(IDC_BACK);
+  back_->SetTooltipText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_BACK)));
+  back_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_BACK));
+  back_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                           views::ImageButton::ALIGN_MIDDLE);
+
+  AddChildView(back_);
+
+  bf_separator_ = new views::ImageView;
+  bf_separator_->SetImage(
+      resource_bundle.GetBitmapNamed(IDR_COMPACTNAV_SEPARATOR));
+  AddChildView(bf_separator_);
+
+  forward_ = new views::ButtonDropDown(this, forward_menu_model_.get());
+  forward_->set_triggerable_event_flags(ui::EF_LEFT_BUTTON_DOWN |
+                                        ui::EF_MIDDLE_BUTTON_DOWN);
+  forward_->set_tag(IDC_FORWARD);
+  forward_->SetTooltipText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD)));
+  forward_->SetAccessibleName(l10n_util::GetStringUTF16((IDS_ACCNAME_FORWARD)));
+  forward_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                              views::ImageButton::ALIGN_MIDDLE);
+  AddChildView(forward_);
+
+  LoadImages();
+}
+
+gfx::Size CompactNavigationBar::GetPreferredSize() {
+  int width = kBackButtonLeftMargin;
+  width += back_->GetPreferredSize().width() + kInnerPadding * 2;
+  width += kHorizMargin;
+  width += bf_separator_->GetPreferredSize().width();
+  width += kHorizMargin;
+  width += forward_->GetPreferredSize().width() + kInnerPadding * 2;
+  width += kForwardButtonRightMargin;
+  return gfx::Size(width, kPreferredHeight);
+}
+
+void CompactNavigationBar::Layout() {
+  if (!initialized_)
+    return;
+
+  // Layout forward/back buttons after entry views as follows:
+  // [Back]|[Forward]
+  int curx = kBackButtonLeftMargin;
+  // "Back | Forward" section.
+  gfx::Size button_size = back_->GetPreferredSize();
+  button_size.set_width(button_size.width() + kInnerPadding * 2);
+  back_->SetBounds(curx, 0, button_size.width(), height());
+  curx += button_size.width() + kHorizMargin;
+
+  button_size = bf_separator_->GetPreferredSize();
+  bf_separator_->SetBounds(curx, 0, button_size.width(), height());
+  curx += button_size.width() + kHorizMargin;
+
+  button_size = forward_->GetPreferredSize();
+  button_size.set_width(button_size.width() + kInnerPadding * 2);
+  forward_->SetBounds(curx, 0, button_size.width(), height());
+}
+
+void CompactNavigationBar::OnPaint(gfx::Canvas* canvas) {

[sky, 2011/05/03 18:38:32]

View::OnPaint invokes OnPaintBackground. Do you need this override?

[SteveT, 2011/05/06 18:48:43]

Yeah you're right, this isn't needed. Removed.

+  OnPaintBackground(canvas);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// views::ButtonListener implementation.
+
+void CompactNavigationBar::ButtonPressed(
+    views::Button* sender, const views::Event& event) {
+  browser_view_->browser()->ExecuteCommandWithDisposition(
+      sender->tag(),
+      event_utils::DispositionFromEventFlags(sender->mouse_event_flags()));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// CommandUpdater::CommandObserver implementation.
+void CompactNavigationBar::EnabledStateChangedForCommand(int id, bool enabled) {
+  switch (id) {
+    case IDC_BACK:
+      back_->SetEnabled(enabled);
+      break;
+    case IDC_FORWARD:
+      forward_->SetEnabled(enabled);
+      break;
+  }
+}
+
+void CompactNavigationBar::LoadImages() {
+  ui::ThemeProvider* tp = GetThemeProvider();
+
+  // TODO: Hook up other button image resources like IDR_COMPACTNAV_FORWARD for
+  // the different button states.
+  back_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_BACK));
+  back_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_BACK_H));
+  back_->SetImage(views::CustomButton::BS_PUSHED,
+      tp->GetBitmapNamed(IDR_BACK_P));
+  back_->SetImage(views::CustomButton::BS_DISABLED,
+      tp->GetBitmapNamed(IDR_BACK_D));
+
+  forward_->SetImage(views::CustomButton::BS_NORMAL,
+      tp->GetBitmapNamed(IDR_FORWARD));
+  forward_->SetImage(views::CustomButton::BS_HOT,
+      tp->GetBitmapNamed(IDR_FORWARD_H));
+  forward_->SetImage(views::CustomButton::BS_PUSHED,
+      tp->GetBitmapNamed(IDR_FORWARD_P));
+  forward_->SetImage(views::CustomButton::BS_DISABLED,
+      tp->GetBitmapNamed(IDR_FORWARD_D));
+}