Rename InfoBarGradient* to InfoBarBackground*.

This is in preparation for removing all traces of "gradient" from the
implementation.

No functional change; only file/class renames.

BUG=none
TEST=none

Change-Id: Ie2d0a16239c37557ea05a7c1eeea3180ad793980
Reviewed-on: https://chromium-review.googlesource.com/996714Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548503}

chrome/app/nibs/InfoBar.xib

@@ -23,7 +23,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="48"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
             <subviews>
-                <customView id="1" customClass="InfoBarGradientView">
+                <customView id="1" customClass="InfoBarBackgroundView">
                     <rect key="frame" x="0.0" y="0.0" width="480" height="48"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <subviews>

chrome/browser/ui/BUILD.gn

@@ -347,6 +347,8 @@ split_static_library("ui") {
       "cocoa/infobars/before_translate_infobar_controller.mm",
       "cocoa/infobars/confirm_infobar_controller.h",
       "cocoa/infobars/confirm_infobar_controller.mm",
+      "cocoa/infobars/infobar_background_view.h",
+      "cocoa/infobars/infobar_background_view.mm",
       "cocoa/infobars/infobar_cocoa.h",
       "cocoa/infobars/infobar_cocoa.mm",
       "cocoa/infobars/infobar_container_cocoa.h",
@@ -355,8 +357,6 @@ split_static_library("ui") {
       "cocoa/infobars/infobar_container_controller.mm",
       "cocoa/infobars/infobar_controller.h",
       "cocoa/infobars/infobar_controller.mm",
-      "cocoa/infobars/infobar_gradient_view.h",
-      "cocoa/infobars/infobar_gradient_view.mm",
       "cocoa/infobars/infobar_utilities.h",
       "cocoa/infobars/infobar_utilities.mm",
       "cocoa/infobars/translate_infobar_base.h",

chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h → chrome/browser/ui/cocoa/infobars/infobar_background_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_GRADIENT_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_GRADIENT_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_BACKGROUND_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_BACKGROUND_VIEW_H_
 
 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -11,11 +11,11 @@
 #import <Cocoa/Cocoa.h>
 
 // A custom view that draws the background gradient for an infobar.
-@interface InfoBarGradientView : VerticalGradientView
+@interface InfoBarBackgroundView : VerticalGradientView
 
 // Sets the infobar background color.
 - (void)setInfobarBackgroundColor:(SkColor)color;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_GRADIENT_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_BACKGROUND_VIEW_H_

chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm → chrome/browser/ui/cocoa/infobars/infobar_background_view.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
+#include "chrome/browser/ui/cocoa/infobars/infobar_background_view.h"
 
 #include "base/mac/scoped_nsobject.h"
 #import "chrome/browser/themes/theme_properties.h"
@@ -14,7 +14,7 @@
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 
-@implementation InfoBarGradientView
+@implementation InfoBarBackgroundView
 
 - (id)initWithFrame:(NSRect)frame {
   self = [super initWithFrame:frame];

chrome/browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm → chrome/browser/ui/cocoa/infobars/infobar_background_view_unittest.mm

@@ -2,30 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "chrome/browser/ui/cocoa/infobars/infobar_background_view.h"
+
 #include "base/mac/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 
 namespace {
 
-class InfoBarGradientViewTest : public CocoaTest {
+class InfoBarBackgroundViewTest : public CocoaTest {
  public:
-  InfoBarGradientViewTest() {
+  InfoBarBackgroundViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 30);
-    base::scoped_nsobject<InfoBarGradientView> view(
-        [[InfoBarGradientView alloc] initWithFrame:frame]);
+    base::scoped_nsobject<InfoBarBackgroundView> view(
+        [[InfoBarBackgroundView alloc] initWithFrame:frame]);
     view_ = view.get();
     [[test_window() contentView] addSubview:view_];
   }
 
-  InfoBarGradientView* view_;  // Weak. Retained by view hierarchy.
+  InfoBarBackgroundView* view_;  // Weak. Retained by view hierarchy.
 };
 
-TEST_VIEW(InfoBarGradientViewTest, view_);
+TEST_VIEW(InfoBarBackgroundViewTest, view_);
 
 // Assert that the view is non-opaque, because otherwise we will end
 // up with findbar painting issues.
-TEST_F(InfoBarGradientViewTest, AssertViewNonOpaque) {
+TEST_F(InfoBarBackgroundViewTest, AssertViewNonOpaque) {
   EXPECT_FALSE([view_ isOpaque]);
 }
 

chrome/browser/ui/cocoa/infobars/infobar_controller.h

@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 
 class InfoBarCocoa;
-@class InfoBarGradientView;
+@class InfoBarBackgroundView;
 
 namespace infobars {
 class InfoBarDelegate;
@@ -26,7 +26,7 @@ class InfoBarDelegate;
   base::WeakPtr<InfoBarCocoa> infobar_;
 
  @protected
-  IBOutlet InfoBarGradientView* infoBarView_;
+  IBOutlet InfoBarBackgroundView* infoBarView_;
   IBOutlet NSImageView* image_;
   IBOutlet NSTextField* labelPlaceholder_;
   IBOutlet NSButton* okButton_;

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

@@ -11,10 +11,10 @@
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
+#import "chrome/browser/ui/cocoa/infobars/infobar_background_view.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
-#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #include "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/grit/theme_resources.h"

chrome/browser/ui/cocoa/infobars/infobar_utilities.mm

@@ -15,8 +15,8 @@
 @implementation InfobarLabelTextField
 
 - (void)drawRect:(NSRect)rect {
-  NSView* infobarGradientView = [self superview];
-  [self cr_drawUsingAncestor:infobarGradientView inRect:rect];
+  NSView* infobarBackgroundView = [self superview];
+  [self cr_drawUsingAncestor:infobarBackgroundView inRect:rect];
   [super drawRect:rect];
 }
 

chrome/test/BUILD.gn

@@ -3986,8 +3986,8 @@ test("unit_tests") {
         "../browser/ui/cocoa/info_bubble_view_unittest.mm",
         "../browser/ui/cocoa/info_bubble_window_unittest.mm",
         "../browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm",
+        "../browser/ui/cocoa/infobars/infobar_background_view_unittest.mm",
         "../browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm",
-        "../browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm",
         "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc",
         "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h",
         "../browser/ui/cocoa/infobars/translate_infobar_unittest.mm",