Remove touch layout

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
@@ skipping 42 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/views/controls/menu/menu_listener.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
@@ skipping 28 matching lines @@
 // our spacing to make it match.
 const int kLeftEdgeSpacing = 3;
 const int kRightEdgeSpacing = 2;
 
 // Ash doesn't use a rounded content area and its top edge has an extra shadow.
 const int kContentShadowHeightAsh = 2;
 
 // Non-ash uses a rounded content area with no shadow in the assets.
 const int kContentShadowHeight = 0;
 
-int GetButtonSpacing() {
-  return (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) ?
-      ToolbarView::kStandardSpacing : 0;
-}
-
 bool IsStreamlinedHostedAppsEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableStreamlinedHostedApps);
 }
 
 #if !defined(OS_CHROMEOS)
 bool HasAshShell() {
 #if defined(USE_ASH)
   return ash::Shell::HasInstance();
 #else
@@ skipping 283 matching lines @@
   DCHECK_EQ(VIEW_ID_APP_MENU, source->id());
 
   bool use_new_menu = false;
   bool supports_new_separators = false;
   // TODO: remove this.
 #if defined(USE_AURA) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
   supports_new_separators =
       GetNativeTheme() == ui::NativeThemeAura::instance();
   use_new_menu = supports_new_separators;
 #endif
-#if defined(OS_WIN)
-  use_new_menu = use_new_menu || ui::GetDisplayLayout() == ui::LAYOUT_TOUCH;
-#endif
 
   wrench_menu_.reset(new WrenchMenu(browser_, use_new_menu,
                                     supports_new_separators));
   wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu));
   wrench_menu_->Init(wrench_menu_model_.get());
 
   FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
 
   wrench_menu_->RunMenu(app_menu_);
 }
@@ skipping 107 matching lines @@
     ui::Accelerator* accelerator) {
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::View overrides:
 
 gfx::Size ToolbarView::GetPreferredSize() {
   gfx::Size size(location_bar_->GetPreferredSize());
   if (is_display_mode_normal()) {
-    int button_spacing = GetButtonSpacing();
     size.Enlarge(
-        kLeftEdgeSpacing + back_->GetPreferredSize().width() + button_spacing +
-            forward_->GetPreferredSize().width() + button_spacing +
+        kLeftEdgeSpacing + back_->GetPreferredSize().width() +
+            forward_->GetPreferredSize().width() +
             reload_->GetPreferredSize().width() + kStandardSpacing +
             (show_home_button_.GetValue() ?
-                (home_->GetPreferredSize().width() + button_spacing) : 0) +
+                home_->GetPreferredSize().width() : 0) +
             (origin_chip_view_->visible() ?
                 (origin_chip_view_->GetPreferredSize().width() +
                     2 * kStandardSpacing) :
                 0) +
             browser_actions_->GetPreferredSize().width() +
             app_menu_->GetPreferredSize().width() + kRightEdgeSpacing,
         0);
     gfx::ImageSkia* normal_background =
         GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     size.SetToMax(
@@ skipping 36 matching lines @@
   //                http://crbug.com/5540
   bool maximized = browser_->window() && browser_->window()->IsMaximized();
   int back_width = back_->GetPreferredSize().width();
   if (maximized) {
     back_->SetBounds(0, child_y, back_width + kLeftEdgeSpacing, child_height);
     back_->SetLeadingMargin(kLeftEdgeSpacing);
   } else {
     back_->SetBounds(kLeftEdgeSpacing, child_y, back_width, child_height);
     back_->SetLeadingMargin(0);
   }
-  int button_spacing = GetButtonSpacing();
-  int next_element_x = back_->bounds().right() + button_spacing;
+  int next_element_x = back_->bounds().right();
 
   forward_->SetBounds(next_element_x, child_y,
                       forward_->GetPreferredSize().width(), child_height);
-  next_element_x = forward_->bounds().right() + button_spacing;
+  next_element_x = forward_->bounds().right();
 
   reload_->SetBounds(next_element_x, child_y,
                      reload_->GetPreferredSize().width(), child_height);
   next_element_x = reload_->bounds().right();
 
   if (show_home_button_.GetValue() ||
       (browser_->is_app() && IsStreamlinedHostedAppsEnabled())) {
     home_->SetVisible(true);
-    home_->SetBounds(next_element_x + button_spacing, child_y,
+    home_->SetBounds(next_element_x, child_y,
                      home_->GetPreferredSize().width(), child_height);
   } else {
     home_->SetVisible(false);
     home_->SetBounds(next_element_x, child_y, 0, child_height);
   }
   next_element_x = home_->bounds().right() + kStandardSpacing;
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int available_width = std::max(0, width() - kRightEdgeSpacing -
@@ skipping 247 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }