Add status area to Aura builds.

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 <set>
 #include <string>
 #include <vector>
@@ skipping 137 matching lines @@
         layout_mode_button_ = static_cast<chromeos::LayoutModeButton*>(view);
         break;
     }
   }
 
   // In the normal and the compact navigation bar mode, ChromeOS
   // lays out compact navigation buttons and status views in the title
   // area. See Layout
   virtual int LayoutTabStripRegion() OVERRIDE {
     if (browser_view_->IsFullscreen() || !browser_view_->IsTabStripVisible()) {
-      status_area_->SetVisible(false);
-      UpdateStatusAreaBoundsProperty();
+      if (status_area_) {
+        status_area_->SetVisible(false);
+        UpdateStatusAreaBoundsProperty();
+      }
       tabstrip_->SetVisible(false);
       tabstrip_->SetBounds(0, 0, 0, 0);
       layout_mode_button_->SetVisible(false);
       layout_mode_button_->SetBounds(0, 0, 0, 0);
       return 0;
     }
 
     gfx::Rect tabstrip_bounds(
         browser_view_->frame()->GetBoundsForTabStrip(tabstrip_));
     gfx::Point tabstrip_origin = tabstrip_bounds.origin();
@@ skipping 19 matching lines @@
 
  private:
   chromeos::BrowserView* chromeos_browser_view() {
     return static_cast<chromeos::BrowserView*>(browser_view_);
   }
 
   // Tests if the point is on one of views that are within the
   // considered title bar area of client view.
   bool IsPointInViewsInTitleArea(const gfx::Point& point)
       const {
-    gfx::Point point_in_status_area_coords(point);
-    views::View::ConvertPointToView(browser_view_, status_area_,
-                                    &point_in_status_area_coords);
-    if (status_area_->HitTest(point_in_status_area_coords))
-      return true;
-
+    if (status_area_) {
+      gfx::Point point_in_status_area_coords(point);
+      views::View::ConvertPointToView(browser_view_, status_area_,
+                                      &point_in_status_area_coords);
+      if (status_area_->HitTest(point_in_status_area_coords))
+        return true;
+    }
     gfx::Point point_in_layout_mode_button_coords(point);
     views::View::ConvertPointToView(browser_view_, layout_mode_button_,
                                     &point_in_layout_mode_button_coords);
     if (layout_mode_button_->HitTest(point_in_layout_mode_button_coords))
       return true;
 
     return false;
   }
 
   // Lays out tabstrip, status area, and layout mode button in the title bar
   // area (given by |bounds|).
   int LayoutTitlebarComponents(const gfx::Rect& bounds) {
     if (bounds.IsEmpty())
       return 0;
 
     const bool show_layout_mode_button =
         chromeos_browser_view()->should_show_layout_mode_button();
 
     tabstrip_->SetVisible(true);
-    status_area_->SetVisible(
-        !chromeos_browser_view()->has_hide_status_area_property());
+    if (status_area_) {
+      status_area_->SetVisible(
+          !chromeos_browser_view()->has_hide_status_area_property());
+    }
     layout_mode_button_->SetVisible(show_layout_mode_button);
 
     const gfx::Size layout_mode_button_size =
         layout_mode_button_->GetPreferredSize();
     layout_mode_button_->SetBounds(
         bounds.right() - layout_mode_button_size.width(),
         bounds.y(),
         layout_mode_button_size.width(),
         layout_mode_button_size.height());
 
-    // Lay out status area after tab strip and before layout mode button (if
-    // shown).
-    gfx::Size status_size = status_area_->GetPreferredSize();
-    const int status_right =
-        show_layout_mode_button ?
-        layout_mode_button_->bounds().x() :
-        bounds.right();
-    status_area_->SetBounds(
-        status_right - status_size.width(),
-        bounds.y() + kStatusAreaVerticalAdjustment,
-        status_size.width(),
-        status_size.height());
-    UpdateStatusAreaBoundsProperty();
+    if (status_area_) {
+      // Lay out status area after tab strip and before layout mode button (if
+      // shown).
+      gfx::Size status_size = status_area_->GetPreferredSize();
+      const int status_right =
+          show_layout_mode_button ?
+          layout_mode_button_->bounds().x() :
+          bounds.right();
+      status_area_->SetBounds(
+          status_right - status_size.width(),
+          bounds.y() + kStatusAreaVerticalAdjustment,
+          status_size.width(),
+          status_size.height());
+      UpdateStatusAreaBoundsProperty();
+    }
     tabstrip_->SetBounds(bounds.x(), bounds.y(),
-        std::max(0, status_area_->bounds().x() - bounds.x()),
-        bounds.height());
+                         std::max(0, status_area_->bounds().x() - bounds.x()),
+                         bounds.height());
     return bounds.bottom();
   }
 
   // Updates |status_area_bounds_for_property_| based on the current bounds and
   // calls WmIpc::SetStatusBoundsProperty() if it changed.
   void UpdateStatusAreaBoundsProperty() {
+    if (!status_area_)
+      return;
     gfx::Rect current_bounds;
     if (status_area_->IsVisible()) {
       gfx::Rect translated_bounds =
           status_area_->parent()->ConvertRectToWidget(status_area_->bounds());
       // To avoid a dead zone across the top of the screen,
       // StatusAreaButton::HitTest() accepts clicks in the area between the top
       // of its own bounds and the top of its parent view.  Make the bounds that
       // we report match.
       current_bounds.SetRect(
           translated_bounds.x(),
@@ skipping 114 matching lines @@
     WmIpc::instance()->SetWindowType(
         GTK_WIDGET(frame()->GetNativeWindow()),
         WM_IPC_WINDOW_CHROME_TOPLEVEL,
         &params);
 #endif
   }
 }
 
 void BrowserView::FocusChromeOSStatus() {
   SaveFocusedView();
-  status_area_->SetPaneFocus(last_focused_view_storage_id(), NULL);
+  if (status_area_)
+    status_area_->SetPaneFocus(last_focused_view_storage_id(), NULL);
 }
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout();
 }
 
 void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
@@ skipping 96 matching lines @@
 // StatusAreaButton::Delegate overrides.
 
 bool BrowserView::ShouldExecuteStatusAreaCommand(
     const views::View* button_view, int command_id) const {
   return true;
 }
 
 void BrowserView::ExecuteStatusAreaCommand(
     const views::View* button_view, int command_id) {
   switch (command_id) {
-    case StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS:
+    case StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS:
       browser()->OpenInternetOptionsDialog();
       break;
-    case StatusAreaViewChromeos::SHOW_LANGUAGE_OPTIONS:
+    case StatusAreaButton::Delegate::SHOW_LANGUAGE_OPTIONS:
       browser()->OpenLanguageOptionsDialog();
       break;
-    case StatusAreaViewChromeos::SHOW_SYSTEM_OPTIONS:
-      browser()->OpenLanguageOptionsDialog();
+    case StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS:
+      browser()->OpenSystemOptionsDialog();
       break;
     default:
       NOTREACHED();
   }
 }
 
 gfx::Font BrowserView::GetStatusAreaFont(const gfx::Font& font) const {
   return font.DeriveFont(0, gfx::Font::BOLD);
 }
 
 StatusAreaButton::TextStyle BrowserView::GetStatusAreaTextStyle() const {
   ThemeService* theme_service =
       ThemeServiceFactory::GetForProfile(browser()->profile());
 
   if (!theme_service->UsingDefaultTheme())
     return StatusAreaButton::WHITE_HALOED;
 
   return IsOffTheRecord() ?
       StatusAreaButton::WHITE_PLAIN : StatusAreaButton::GRAY_EMBOSSED;
 }
 
 void BrowserView::ButtonVisibilityChanged(views::View* button_view) {
-  status_area_->UpdateButtonVisibility();
+  if (status_area_)
+    status_area_->UpdateButtonVisibility();
 }
 
 // BrowserView, MessageLoopForUI::Observer implementation.
 
 #if defined(TOUCH_UI) || defined(USE_AURA)
 base::EventStatus BrowserView::WillProcessEvent(
     const base::NativeEvent& event) OVERRIDE {
   return base::EVENT_CONTINUE;
 }
 
@@ skipping 19 matching lines @@
     }
   }
 }
 #endif
 
 // BrowserView protected:
 
 void BrowserView::GetAccessiblePanes(
     std::vector<AccessiblePaneView*>* panes) {
   ::BrowserView::GetAccessiblePanes(panes);
-  panes->push_back(status_area_);
+  if (status_area_)
+    panes->push_back(status_area_);
 }
 
 // BrowserView private.
 
 void BrowserView::InitSystemMenu() {
   views::MenuItemView* menu =
       new views::MenuItemView(system_menu_delegate_.get());
   // MenuRunner takes ownership of menu.
   system_menu_runner_.reset(new views::MenuRunner(menu));
   menu->AppendDelegateMenuItem(IDC_RESTORE_TAB);
@@ skipping 39 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->is_type_popup() || browser->is_type_panel())
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }