Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc |
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc |
index dfbb6943f99105b0b9526fd0276a75478b118e5d..bf4d72bbf6b681ec7dc28ccc8682e43b983cc2ad 100644 |
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc |
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc |
@@ -131,10 +131,10 @@ class WindowControlButton : public views::CustomButton { |
// Layer that visually sits "behind" the window contents and expands out to |
// provide visual resize handles on the sides. Hit testing and resize handling |
// is in the parent NonClientFrameView. |
-class FrameBackground : public views::View, |
- public ui::AnimationDelegate { |
+class FrameBackgroundView : public views::View, |
+ public ui::AnimationDelegate { |
public: |
- FrameBackground() |
+ FrameBackgroundView() |
: ALLOW_THIS_IN_INITIALIZER_LIST( |
size_animation_(new ui::SlideAnimation(this))), |
ALLOW_THIS_IN_INITIALIZER_LIST( |
@@ -144,7 +144,7 @@ class FrameBackground : public views::View, |
SetPaintToLayer(true); |
UpdateOpacity(); |
} |
- virtual ~FrameBackground() { |
+ virtual ~FrameBackgroundView() { |
} |
void Configure(const gfx::Rect& start_bounds, const gfx::Rect& end_bounds) { |
@@ -211,7 +211,7 @@ class FrameBackground : public views::View, |
// Expanded bounds, with edges visible from behind the client area. |
gfx::Rect end_bounds_; |
- DISALLOW_COPY_AND_ASSIGN(FrameBackground); |
+ DISALLOW_COPY_AND_ASSIGN(FrameBackgroundView); |
}; |
/////////////////////////////////////////////////////////////////////////////// |
@@ -221,7 +221,7 @@ BrowserNonClientFrameViewAura::BrowserNonClientFrameViewAura( |
BrowserFrame* frame, BrowserView* browser_view) |
: BrowserNonClientFrameView(frame, browser_view), |
last_hittest_code_(HTNOWHERE) { |
- frame_background_ = new FrameBackground(); |
+ frame_background_ = new FrameBackgroundView(); |
AddChildView(frame_background_); |
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |