Create c/b/ui/views/layout_constants.*.

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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_commands_global_registry.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/back_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
 #include "chrome/browser/ui/views/toolbar/reload_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
@@ skipping 438 matching lines @@
 bool ToolbarView::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::View overrides:
 
 gfx::Size ToolbarView::GetPreferredSize() const {
   gfx::Size size(location_bar_->GetPreferredSize());
-  ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (is_display_mode_normal()) {
-    const int element_padding = theme_provider->GetDisplayProperty(
-        ThemeProperties::PROPERTY_TOOLBAR_VIEW_ELEMENT_PADDING);
+    const int element_padding = GetLayoutConstant(TOOLBAR_VIEW_ELEMENT_PADDING);
     const int browser_actions_width =
         browser_actions_->GetPreferredSize().width();
     const int content_width =
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING) +
+        GetLayoutInsets(TOOLBAR_VIEW).width() +
         back_->GetPreferredSize().width() + element_padding +
         forward_->GetPreferredSize().width() + element_padding +
         reload_->GetPreferredSize().width() +
         (show_home_button_.GetValue()
              ? element_padding + home_->GetPreferredSize().width()
              : 0) +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_STANDARD_SPACING) +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING) +
+        GetLayoutConstant(TOOLBAR_VIEW_STANDARD_SPACING) +
+        GetLayoutConstant(TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING) +
         browser_actions_width +
         (browser_actions_width > 0 ? element_padding : 0) +
-        app_menu_->GetPreferredSize().width() +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING);
+        app_menu_->GetPreferredSize().width();
     size.Enlarge(content_width, 0);
   }
   return SizeForContentSize(size);
 }
 
 gfx::Size ToolbarView::GetMinimumSize() const {
   gfx::Size size(location_bar_->GetMinimumSize());
-  ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (is_display_mode_normal()) {
-    const int element_padding = theme_provider->GetDisplayProperty(
-        ThemeProperties::PROPERTY_TOOLBAR_VIEW_ELEMENT_PADDING);
+    const int element_padding = GetLayoutConstant(TOOLBAR_VIEW_ELEMENT_PADDING);
     const int browser_actions_width =
         browser_actions_->GetMinimumSize().width();
     const int content_width =
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING) +
+        GetLayoutInsets(TOOLBAR_VIEW).width() +
         back_->GetMinimumSize().width() + element_padding +
         forward_->GetMinimumSize().width() + element_padding +
         reload_->GetMinimumSize().width() +
         (show_home_button_.GetValue()
              ? element_padding + home_->GetMinimumSize().width()
              : 0) +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_STANDARD_SPACING) +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING) +
+        GetLayoutConstant(TOOLBAR_VIEW_STANDARD_SPACING) +
+        GetLayoutConstant(TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING) +
         browser_actions_width +
         (browser_actions_width > 0 ? element_padding : 0) +
-        app_menu_->GetMinimumSize().width() +
-        theme_provider->GetDisplayProperty(
-            ThemeProperties::PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING);
+        app_menu_->GetMinimumSize().width();
     size.Enlarge(content_width, 0);
   }
   return SizeForContentSize(size);
 }
 
 void ToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
   if (back_ == NULL)
     return;
 
@@ skipping 11 matching lines @@
 
   // If the window is maximized, we extend the back button to the left so that
   // clicking on the left-most pixel will activate the back button.
   // TODO(abarth):  If the window becomes maximized but is not resized,
   //                then Layout() might not be called and the back button
   //                will be slightly the wrong size.  We should force a
   //                Layout() in this case.
   //                http://crbug.com/5540
   bool maximized = browser_->window() && browser_->window()->IsMaximized();
   int back_width = back_->GetPreferredSize().width();
-  ui::ThemeProvider* theme_provider = GetThemeProvider();
-  const int left_edge_spacing = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING);
+  const gfx::Insets insets(GetLayoutInsets(TOOLBAR_VIEW));
   if (maximized) {
-    back_->SetBounds(0, child_y, back_width + left_edge_spacing, child_height);
-    back_->SetLeadingMargin(left_edge_spacing);
+    back_->SetBounds(0, child_y, back_width + insets.left(), child_height);
+    back_->SetLeadingMargin(insets.left());
   } else {
-    back_->SetBounds(left_edge_spacing, child_y, back_width, child_height);
+    back_->SetBounds(insets.left(), child_y, back_width, child_height);
     back_->SetLeadingMargin(0);
   }
-  const int element_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_TOOLBAR_VIEW_ELEMENT_PADDING);
+  const int element_padding = GetLayoutConstant(TOOLBAR_VIEW_ELEMENT_PADDING);
   int next_element_x = back_->bounds().right() + element_padding;
 
   forward_->SetBounds(next_element_x, child_y,
                       forward_->GetPreferredSize().width(), child_height);
   next_element_x = forward_->bounds().right() + element_padding;
 
   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() && extensions::util::IsNewBookmarkAppsEnabled())) {
     next_element_x += element_padding;
     home_->SetVisible(true);
     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() +
-                   theme_provider->GetDisplayProperty(
-                       ThemeProperties::PROPERTY_TOOLBAR_VIEW_STANDARD_SPACING);
+                   GetLayoutConstant(TOOLBAR_VIEW_STANDARD_SPACING);
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
-  const int right_edge_spacing = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING);
-  const int location_bar_right_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING);
+  const int location_bar_right_padding =
+      GetLayoutConstant(TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING);
   int available_width = std::max(
-      0, width() - right_edge_spacing - app_menu_width - browser_actions_width -
+      0, width() - insets.right() - app_menu_width - browser_actions_width -
              (browser_actions_width > 0 ? element_padding : 0) -
              location_bar_right_padding - next_element_x);
 
   int location_height = location_bar_->GetPreferredSize().height();
   int location_y = CenteredChildY(height(), location_height);
 
   location_bar_->SetBounds(next_element_x, location_y,
                            std::max(available_width, 0), location_height);
   next_element_x = location_bar_->bounds().right() + location_bar_right_padding;
 
   browser_actions_->SetBounds(
       next_element_x, child_y, browser_actions_width, child_height);
   next_element_x = browser_actions_->bounds().right();
   if (browser_actions_width > 0)
     next_element_x += element_padding;
 
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
   // SetBounds does not do a layout at all.
   // TODO(sidchat): Rework the above behavior so that explicit layout is not
   //                required.
   browser_actions_->Layout();
 
   // Extend the app menu to the screen's right edge in maximized mode just like
   // we extend the back button to the left edge.
   if (maximized)
-    app_menu_width += right_edge_spacing;
+    app_menu_width += insets.right();
   app_menu_->SetBounds(next_element_x, child_y, app_menu_width, child_height);
 }
 
 void ToolbarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (is_display_mode_normal())
     return;
 
   // For glass, we need to draw a black line below the location bar to separate
@@ skipping 109 matching lines @@
 }
 
 gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
   if (is_display_mode_normal()) {
     // For Material Design the size of the toolbar is computed using the size
     // of the location bar and constant padding values. For non-material the
     // size is based on the provided assets.
     if (ui::MaterialDesignController::IsModeMaterial()) {
       int content_height = std::max(back_->GetPreferredSize().height(),
                                     location_bar_->GetPreferredSize().height());
-      int top_padding = GetThemeProvider()->GetDisplayProperty(
-          ThemeProperties::PROPERTY_TOOLBAR_VIEW_TOP_VERTICAL_PADDING);
-      int bottom_padding = GetThemeProvider()->GetDisplayProperty(
-          ThemeProperties::PROPERTY_TOOLBAR_VIEW_BOTTOM_VERTICAL_PADDING);
-      size.SetToMax(
-          gfx::Size(0, content_height + top_padding + bottom_padding));
+      int padding = GetLayoutInsets(TOOLBAR_VIEW).height();
+      size.SetToMax(gfx::Size(0, content_height + padding));
     } else {
       gfx::ImageSkia* normal_background =
           GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
       size.SetToMax(
           gfx::Size(0, normal_background->height() - content_shadow_height()));
     }
   } else if (size.height() == 0) {
     // Location mode with a 0 height location bar. If on ash, expand by one
     // pixel to show a border in the title bar, otherwise leave the size as zero
     // height.
@@ skipping 49 matching lines @@
         app_menu_, browser_, auto_update_enabled);
   }
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
-  ui::ThemeProvider* theme_provider = GetThemeProvider();
-  return theme_provider->GetDisplayProperty(
-      browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH
-          ? ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
-          : ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
+  return GetLayoutConstant(
+      (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+          ? TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
+          : TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
 }