Move infobar constants and the code that uses them from components/ to chrome/.

chrome/browser/ui/views/infobars/extension_infobar.cc

 // Copyright (c) 2012 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/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/infobar_container_delegate.h"
 #include "chrome/browser/ui/views/extensions/extension_view_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 77 matching lines @@
 void ExtensionInfoBar::Layout() {
   InfoBarView::Layout();
 
   infobar_icon_->SetPosition(gfx::Point(StartX(), OffsetY(infobar_icon_)));
   ExtensionViewViews* extension_view = GetExtensionView();
   // TODO(pkasting): We'd like to simply set the extension view's desired height
   // at creation time and position using OffsetY() like for other infobar items,
   // but the NativeViewHost inside does not seem to be clipped by the ClipRect()
   // call in InfoBarView::PaintChildren(), so we have to manually clamp the size
   // here.
-  extension_view->SetSize(
-      gfx::Size(std::max(0, EndX() - StartX() - NonExtensionViewWidth()),
-                std::min(height() - kSeparatorLineHeight - arrow_height(),
-                         GetDelegate()->height())));
+  extension_view->SetSize(gfx::Size(
+      std::max(0, EndX() - StartX() - NonExtensionViewWidth()),
+      std::min(
+          height() - InfoBarContainerDelegate::kSeparatorLineHeight -
+              arrow_height(),
+          GetDelegate()->height())));
   // We do SetPosition() separately after SetSize() so OffsetY() will work.
   extension_view->SetPosition(
       gfx::Point(infobar_icon_->bounds().right() + kIconHorizontalMargin,
                  std::max(arrow_height(), OffsetY(extension_view))));
 }
 
 void ExtensionInfoBar::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add || (details.child != this) || (infobar_icon_ != NULL)) {
     InfoBarView::ViewHierarchyChanged(details);
@@ skipping 104 matching lines @@
 }
 
 ExtensionViewViews* ExtensionInfoBar::GetExtensionView() {
   return static_cast<ExtensionViewViews*>(
       GetDelegate()->extension_view_host()->view());
 }
 
 int ExtensionInfoBar::NonExtensionViewWidth() const {
   return infobar_icon_->width() + kIconHorizontalMargin;
 }