Add a first attempt at a compact location bar and a status bar. The status ba...

chrome/browser/views/frame/status_area_view.cc

Index: chrome/browser/views/frame/status_area_view.cc
===================================================================
--- chrome/browser/views/frame/status_area_view.cc	(revision 0)
+++ chrome/browser/views/frame/status_area_view.cc	(revision 0)
@@ -0,0 +1,243 @@
+// 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/views/frame/status_area_view.h"
+
+#include <algorithm>
+
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "app/theme_provider.h"
+#include "base/string_util.h"
+#include "base/time.h"
+#include "base/timer.h"
+#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/profile.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/image_view.h"
+#include "views/controls/menu/menu.h"
+#include "views/controls/menu/simple_menu_model.h"
+
+namespace {
+
+// Number of pixels to separate adjacent status items.
+const int kStatusItemSeparation = 1;
+
+class ClockView : public views::View {
+ public:
+  ClockView();
+  virtual ~ClockView();
+
+  // views::View* overrides.
+  virtual gfx::Size GetPreferredSize();
+  virtual void Paint(gfx::Canvas* canvas);
+
+ private:
+  // Schedules the timer to fire at the next minute interval.
+  void SetNextTimer();
+
+  // Schedules a paint when the timer goes off.
+  void OnTimer();
+
+  gfx::Font font_;
+
+  base::OneShotTimer<ClockView> timer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ClockView);
+};
+
+// Amount of slop to add into the timer to make sure we're into the next minute
+// when the timer goes off.
+const int kTimerSlopSeconds = 1;
+
+ClockView::ClockView()
+    : font_(ResourceBundle::GetSharedInstance().GetFont(
+                ResourceBundle::BaseFont)) {
+  SetNextTimer();
+}
+
+ClockView::~ClockView() {
+}
+
+gfx::Size ClockView::GetPreferredSize() {
+  return gfx::Size(40, 10);
+}
+
+void ClockView::Paint(gfx::Canvas* canvas) {
+  base::Time now = base::Time::Now();
+  base::Time::Exploded now_exploded;
+  now.LocalExplode(&now_exploded);
+
+  std::wstring time_string = StringPrintf(L"%d:%d",
+                                          now_exploded.hour,
+                                          now_exploded.minute);
+  canvas->DrawStringInt(time_string, font_, SK_ColorWHITE, 0, 0,
+                        width(), height(), gfx::Canvas::TEXT_ALIGN_CENTER);
+}
+
+void ClockView::SetNextTimer() {
+  // Try to set the timer to go off at the next change of the minute. We don't
+  // want to have the timer go off more than necessary since that will cause
+  // the CPU to wake up and consume power.
+  base::Time now = base::Time::Now();
+  base::Time::Exploded exploded;
+  now.LocalExplode(&exploded);
+
+  // Often this will be called at minute boundaries, and we'll actually want
+  // 60 seconds from now.
+  int seconds_left = 60 - exploded.second;
+  if (seconds_left == 0)
+    seconds_left = 60;
+
+  // Make sure that the timer fires on the next minute. Without this, if it is
+  // called just a teeny bit early, then it will skip the next minute.
+  seconds_left += kTimerSlopSeconds;
+
+  timer_.Start(base::TimeDelta::FromSeconds(seconds_left),
+               this, &ClockView::OnTimer);
+}
+
+void ClockView::OnTimer() {
+  SchedulePaint();
+  SetNextTimer();
+}
+
+}  // namespace
+
+StatusAreaView::StatusAreaView(Browser* browser)
+    : browser_(browser),
+      battery_view_(NULL),
+      menu_view_(NULL) {
+}
+
+StatusAreaView::~StatusAreaView() {
+}
+
+void StatusAreaView::Init() {
+  ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
+
+  // Battery.
+  battery_view_ = new views::ImageView;
+  battery_view_->SetImage(
+      resource_bundle.GetBitmapNamed(IDR_STATUSBAR_BATTERY));
+  AddChildView(battery_view_);
+
+  // Clock.
+  AddChildView(new ClockView);
+
+  // Menu.
+  menu_view_ = new views::MenuButton(NULL, std::wstring(), this, false);
+  menu_view_->SetIcon(*resource_bundle.GetBitmapNamed(IDR_STATUSBAR_MENU));
+  AddChildView(menu_view_);
+}
+
+gfx::Size StatusAreaView::GetPreferredSize() {
+  int result_w = kStatusItemSeparation;  // Left border.
+  int result_h = 0;
+  for (int i = 0; i < GetChildViewCount(); i++) {
+    gfx::Size cur_size = GetChildViewAt(i)->GetPreferredSize();
+    result_w += cur_size.width() + kStatusItemSeparation;
+    result_h = std::max(result_h, cur_size.height());
+  }
+  result_w -= kStatusItemSeparation;  // Don't have space after the last one.
+
+  // TODO(brettw) do we need to use result_h? This is currently hardcoded
+  // becuase the menu button really wants to be larger, but we don't want
+  // the status bar to force the whole tab strip to be larger. Making it
+  // "small" just means that we'll expand to the height, which we want.
+  return gfx::Size(result_w - kStatusItemSeparation, 10);
+}
+
+void StatusAreaView::Layout() {
+  int cur_x = 0;
+  for (int i = 0; i < GetChildViewCount(); i++) {
+    views::View* cur = GetChildViewAt(i);
+    gfx::Size cur_size = cur->GetPreferredSize();
+
+    // Put next in row horizontally, and center vertically.
+    cur->SetBounds(cur_x, (height() - cur_size.height()) / 2,
+                   cur_size.width(), cur_size.height());
+    cur_x += cur_size.width() + kStatusItemSeparation;
+  }
+}
+
+void StatusAreaView::Paint(gfx::Canvas* canvas) {
+  ThemeProvider* theme = browser_->profile()->GetThemeProvider();
+
+  // Fill the background.
+  SkBitmap* background = theme->GetBitmapNamed(IDR_THEME_FRAME);
+  canvas->TileImageInt(*background, 0, 0, width(), height());
+}
+
+void StatusAreaView::CreateAppMenu() {
+  if (app_menu_contents_.get())
+    return;
+
+  app_menu_contents_.reset(new views::SimpleMenuModel(this));
+  app_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
+  app_menu_contents_->AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
+  app_menu_contents_->AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW,
+                                          IDS_NEW_INCOGNITO_WINDOW);
+  app_menu_contents_->AddSeparator();
+  app_menu_contents_->AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR,
+                                               IDS_SHOW_BOOKMARK_BAR);
+  app_menu_contents_->AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
+  app_menu_contents_->AddSeparator();
+  app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
+  app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER,
+                                          IDS_BOOKMARK_MANAGER);
+  app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS,
+                                          IDS_SHOW_DOWNLOADS);
+  app_menu_contents_->AddSeparator();
+  app_menu_contents_->AddItemWithStringId(IDC_CLEAR_BROWSING_DATA,
+                                          IDS_CLEAR_BROWSING_DATA);
+  app_menu_contents_->AddItemWithStringId(IDC_IMPORT_SETTINGS,
+                                          IDS_IMPORT_SETTINGS);
+  app_menu_contents_->AddSeparator();
+  app_menu_contents_->AddItem(IDC_OPTIONS,
+                              l10n_util::GetStringFUTF16(
+                                  IDS_OPTIONS,
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  app_menu_contents_->AddItem(IDC_ABOUT,
+                              l10n_util::GetStringFUTF16(
+                                  IDS_ABOUT,
+                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
+  app_menu_contents_->AddSeparator();
+  app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
+
+  app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
+}
+
+bool StatusAreaView::IsCommandIdChecked(int command_id) const {
+  return false;
+}
+
+bool StatusAreaView::IsCommandIdEnabled(int command_id) const {
+  if (command_id == IDC_RESTORE_TAB)
+    return browser_->CanRestoreTab();
+  return browser_->command_updater()->IsCommandEnabled(command_id);
+}
+
+bool StatusAreaView::GetAcceleratorForCommandId(
+    int command_id,
+    views::Accelerator* accelerator) {
+  return false;
+}
+
+void StatusAreaView::ExecuteCommand(int command_id) {
+  browser_->ExecuteCommand(command_id);
+}
+
+void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt,
+                             gfx::NativeView hwnd) {
+  CreateAppMenu();
+  app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+}
Property changes on: chrome/browser/views/frame/status_area_view.cc
___________________________________________________________________
Added: svn:eol-style
   + LF