Removing the app launcher button on ChromeOS

chrome/browser/chromeos/frame/browser_view.cc

 // Copyright (c) 2010 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>
 
@@ skipping 104 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChromeosTabStrip);
 };
 */
 
 }  // namespace
 
 namespace chromeos {
 
 // LayoutManager for BrowserView, which layouts extra components such as
-// main menu, stataus views as follows:
-//                     ____  __ __
-//      [AppLauncher] /    \   \  \     [StatusArea]
+// the status views as follows:
+//       ____  __ __
+//      /    \   \  \     [StatusArea]
 //
 class BrowserViewLayout : public ::BrowserViewLayout {
  public:
   BrowserViewLayout() : ::BrowserViewLayout() {}
   virtual ~BrowserViewLayout() {}
 
   //////////////////////////////////////////////////////////////////////////////
   // BrowserViewLayout overrides:
 
   void Installed(views::View* host) {
-    main_menu_button_ = NULL;
     compact_navigation_bar_ = NULL;
     status_area_ = NULL;
     spacer_ = NULL;
     ::BrowserViewLayout::Installed(host);
   }
 
   void ViewAdded(views::View* host,
                  views::View* view) {
     ::BrowserViewLayout::ViewAdded(host, view);
     switch (view->GetID()) {
       case VIEW_ID_SPACER:
         spacer_ = view;
         break;
-      case VIEW_ID_APP_MENU_BUTTON:
-        main_menu_button_ = view;
-        break;
       case VIEW_ID_STATUS_AREA:
         status_area_ = static_cast<chromeos::StatusAreaView*>(view);
         break;
       case VIEW_ID_COMPACT_NAV_BAR:
         compact_navigation_bar_ = view;
         break;
       case VIEW_ID_OTR_AVATAR:
         otr_avatar_icon_ = view;
         break;
     }
   }
 
   // In the normal and the compact navigation bar mode, ChromeOS
   // layouts compact navigation buttons and status views in the title
   // area. See Layout
   virtual int LayoutTabStrip() {
     if (browser_view_->IsFullscreen() ||
         !browser_view_->IsTabStripVisible()) {
-      main_menu_button_->SetVisible(false);
       compact_navigation_bar_->SetVisible(false);
       status_area_->SetVisible(false);
       otr_avatar_icon_->SetVisible(false);
       tabstrip_->SetVisible(false);
       tabstrip_->SetBounds(0, 0, 0, 0);
       return 0;
     } else {
       gfx::Rect layout_bounds =
           browser_view_->frame()->GetBoundsForTabStrip(tabstrip_);
       gfx::Point tabstrip_origin = layout_bounds.origin();
@@ skipping 20 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_main_menu_coords(point);
-    views::View::ConvertPointToView(browser_view_, main_menu_button_,
-                                    &point_in_main_menu_coords);
-    if (main_menu_button_->HitTest(point_in_main_menu_coords))
-      return true;
-
     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 (compact_navigation_bar_->IsVisible()) {
       gfx::Point point_in_cnb_coords(point);
       views::View::ConvertPointToView(browser_view_,
                                       compact_navigation_bar_,
                                       &point_in_cnb_coords);
       return compact_navigation_bar_->HitTest(point_in_cnb_coords);
     }
     return false;
   }
 
   // Layouts components in the title bar area (given by
   // |bounds|). These include the main menu, the compact navigation
   // buttons (in compact navbar mode), the otr avatar icon (in
   // incognito window), the tabstrip and the the status area.
   int LayoutTitlebarComponents(const gfx::Rect& bounds) {
     if (bounds.IsEmpty()) {
       return 0;
     }
-    main_menu_button_->SetVisible(true);
     compact_navigation_bar_->SetVisible(
         chromeos_browser_view()->is_compact_style());
     tabstrip_->SetVisible(true);
     otr_avatar_icon_->SetVisible(browser_view_->ShouldShowOffTheRecordAvatar());
     status_area_->SetVisible(true);
 
     int bottom = bounds.bottom();
 
     /* TODO(oshima):
      * Disabling the ability to update location bar on re-layout bacause
      * tabstrip state may not be in sync with the browser's state when
      * new tab is added. We should decide when we know more about this
      * feature. May be we should simply hide the location?
      * Filed a bug: http://crbug.com/30612.
      if (compact_navigation_bar_->IsVisible()) {
      // Update the size and location of the compact location bar.
      int index = browser_view()->browser()->selected_index();
      compact_location_bar_host_->Update(index, false, true);
      }
     */
 
-    // Layout main menu before tab strip.
-    gfx::Size main_menu_size = main_menu_button_->GetPreferredSize();
-    main_menu_button_->SetBounds(0, bounds.y(),
-                                 main_menu_size.width(), bounds.height());
-
     status_area_->Update();
     // Layout status area after tab strip.
     gfx::Size status_size = status_area_->GetPreferredSize();
     status_area_->SetBounds(bounds.x() + bounds.width() - status_size.width(),
                             bounds.y(), status_size.width(),
                             status_size.height());
     LayoutOTRAvatar(bounds);
 
-    int curx = bounds.x() + main_menu_size.width();
+    int curx = bounds.x();
 
     if (compact_navigation_bar_->IsVisible()) {
       gfx::Size cnb_size = compact_navigation_bar_->GetPreferredSize();
       // Adjust the size of the compact nativation bar to avoid creating
       // a fixed widget with its own gdk window. AutocompleteEditView
       // expects the parent view to be transparent, but a fixed with
       // its own window is not.
       gfx::Rect cnb_bounds(curx, bounds.y(), cnb_size.width(), bounds.height());
       compact_navigation_bar_->SetBounds(
           cnb_bounds.Intersect(browser_view_->GetVisibleBounds()));
@@ skipping 29 matching lines @@
       gfx::Size preferred_size = otr_avatar_icon_->GetPreferredSize();
 
       int y = bounds.bottom() - preferred_size.height() - kOTRBottomSpacing;
       int x = status_bounds.x() - kOTRSideSpacing - preferred_size.width();
       otr_avatar_icon_->SetBounds(x, y, preferred_size.width(),
                                   preferred_size.height());
     }
   }
 
 
-  views::View* main_menu_button_;
   chromeos::StatusAreaView* status_area_;
   views::View* compact_navigation_bar_;
   views::View* spacer_;
   views::View* otr_avatar_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
 };
 
 BrowserView::BrowserView(Browser* browser)
     : ::BrowserView(browser),
-      main_menu_button_(NULL),
       status_area_(NULL),
       compact_navigation_bar_(NULL),
       // Standard style is default.
       // TODO(oshima): Get this info from preference.
       ui_style_(StandardStyle),
       force_maximized_window_(false),
       spacer_(NULL),
       otr_avatar_icon_(new views::ImageView()) {
 }
 
 BrowserView::~BrowserView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserView, ::BrowserView overrides:
 
 void BrowserView::Init() {
   ::BrowserView::Init();
-  main_menu_button_ = new views::ImageButton(this);
-  main_menu_button_->SetID(VIEW_ID_APP_MENU_BUTTON);
   ThemeProvider* theme_provider =
       frame()->GetThemeProviderForFrame();
-  SkBitmap* image = theme_provider->GetBitmapNamed(IDR_APP_LAUNCHER_BUTTON);
-  main_menu_button_->SetImage(views::CustomButton::BS_NORMAL, image);
-  main_menu_button_->SetImage(views::CustomButton::BS_HOT, image);
-  main_menu_button_->SetImage(views::CustomButton::BS_PUSHED, image);
-  AddChildView(main_menu_button_);
 
   compact_location_bar_host_.reset(
       new chromeos::CompactLocationBarHost(this));
   compact_navigation_bar_ =
       new chromeos::CompactNavigationBar(this);
   compact_navigation_bar_->SetID(VIEW_ID_COMPACT_NAV_BAR);
   AddChildView(compact_navigation_bar_);
   compact_navigation_bar_->Init();
   status_area_ = new BrowserStatusAreaView(this);
   status_area_->SetID(VIEW_ID_STATUS_AREA);
@@ skipping 67 matching lines @@
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout();
 }
 
 void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
   SchedulePaint();
 }
 
-// views::ButtonListener overrides.
-void BrowserView::ButtonPressed(views::Button* sender,
-                                const views::Event& event) {
-  gfx::Rect bounds = main_menu_button_->bounds();
-  gfx::Point origin = bounds.origin();
-  // Move the origin to the right otherwise the app launcher info bubble left
-  // border will show out of screen.
-  origin.Offset(kAppLauncherLeftPadding, 0);
-  views::RootView::ConvertPointToScreen(this, &origin);
-  bounds.set_origin(origin);
-  ::AppLauncher::Show(browser(), bounds, gfx::Point(), std::string());
-}
-
 // views::ContextMenuController overrides.
 void BrowserView::ShowContextMenu(views::View* source,
                                   const gfx::Point& p,
                                   bool is_mouse_gesture) {
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
   // - HTNOWHERE: as the name implies.
   gfx::Point point_in_parent_coords(p);
   views::View::ConvertPointToView(NULL, GetParent(), &point_in_parent_coords);
@@ skipping 67 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;
 }