Implement new gray mock.

chrome/browser/chromeos/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/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/frame/browser_frame_gtk.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/theme_background.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/window/hit_test.h"
 #include "views/window/window.h"
 
 namespace {
 
 // Amount to offset the toolbar by when vertical tabs are enabled.
 const int kVerticalTabStripToolbarOffset = 2;
+// Amount to tweak the position of the status area to get it to look right.
+const int kStatusAreaVerticalAdjustment = -1;
+
 // If a popup window is larger than this fraction of the screen, create a tab.
 const float kPopupMaxWidthFactor = 0.5;
 const float kPopupMaxHeightFactor = 0.6;
 
 }  // namespace
 
 namespace chromeos {
 
 // LayoutManager for BrowserView, which layouts extra components such as
 // the status views as follows:
@@ skipping 135 matching lines @@
   // |bounds|).
   int LayoutTitlebarComponents(const gfx::Rect& bounds) {
     if (bounds.IsEmpty())
       return 0;
 
     tabstrip_->SetVisible(true);
     status_area_->SetVisible(true);
 
     // Layout status area after tab strip.
     gfx::Size status_size = status_area_->GetPreferredSize();
-    status_area_->SetBounds(bounds.right() - status_size.width(), bounds.y(),
-                            status_size.width(), status_size.height());
+    status_area_->SetBounds(
+        bounds.right() - status_size.width(),
+        bounds.y() + kStatusAreaVerticalAdjustment,
+        status_size.width(),
+        status_size.height());
     tabstrip_->SetBounds(bounds.x(), bounds.y(),
         std::max(0, status_area_->bounds().x() - bounds.x()),
         bounds.height());
     return bounds.bottom();
   }
 
   chromeos::StatusAreaView* status_area_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
 };
@@ skipping 168 matching lines @@
     browser()->OpenLanguageOptionsDialog();
   } else {
     browser()->OpenSystemOptionsDialog();
   }
 }
 
 StatusAreaHost::ScreenMode BrowserView::GetScreenMode() const {
   return kBrowserMode;
 }
 
+StatusAreaHost::TextStyle BrowserView::GetTextStyle() const {
+  ui::ThemeProvider* tp = GetThemeProvider();
+  return tp->HasCustomImage(IDR_THEME_FRAME) ?
+      StatusAreaHost::kWhiteHaloed : IsOffTheRecord() ?

[sky, 2011/05/02 14:26:27]

Oi. Can you use () around the first conditional to this a bit more readable.

+          StatusAreaHost::kWhitePlain : StatusAreaHost::kGrayEmbossed;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserView protected:
 
 void BrowserView::GetAccessiblePanes(
     std::vector<AccessiblePaneView*>* panes) {
   ::BrowserView::GetAccessiblePanes(panes);
   panes->push_back(status_area_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 16 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->type() & Browser::TYPE_POPUP)
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   BrowserFrame::Create(view, browser->profile());
   return view;
 }