Rename BaseNativeAppWindowViews and NativeAppWindowViews

chrome/browser/ui/views/apps/chrome_native_app_window_views.h

 // 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
 
-#include "apps/ui/views/base_native_app_window_views.h"
+#include "apps/ui/views/native_app_window_views.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/context_menu_controller.h"
 
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
 }
 #endif
 
 class ExtensionKeybindingRegistryViews;
 
 namespace views {
 class MenuRunner;
 }
 
-class NativeAppWindowViews : public BaseNativeAppWindowViews,
-                             public views::ContextMenuController {
+class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews,
+                                   public views::ContextMenuController {
  public:
-  NativeAppWindowViews();
-  virtual ~NativeAppWindowViews();
+  ChromeNativeAppWindowViews();
+  virtual ~ChromeNativeAppWindowViews();
 
   SkRegion* shape() { return shape_.get(); }
 
  protected:
   // Called before views::Widget::Init() to allow subclasses to customize
   // the InitParams that would be passed.
   virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
                                   views::Widget* widget);
 
   virtual void InitializeDefaultWindow(
@@ skipping 38 matching lines @@
 
   // NativeAppWindow implementation.
   virtual void SetFullscreen(int fullscreen_types) OVERRIDE;
   virtual bool IsFullscreenOrPending() const OVERRIDE;
   virtual bool IsDetached() const OVERRIDE;
   virtual void UpdateBadgeIcon() OVERRIDE;
   virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
   virtual bool HasFrameColor() const OVERRIDE;
   virtual SkColor FrameColor() const OVERRIDE;
 
-  // BaseNativeAppWindowViews implementation.
+  // NativeAppWindowViews implementation.
   virtual void InitializeWindow(
       apps::AppWindow* app_window,
       const apps::AppWindow::CreateParams& create_params) OVERRIDE;
 
   // True if the window is fullscreen or fullscreen is pending.
   bool is_fullscreen_;
 
   // Custom shape of the window. If this is not set then the window has a
   // default shape, usually rectangular.
   scoped_ptr<SkRegion> shape_;
@@ skipping 10 matching lines @@
   // immersive fullscreen, the window header (title bar and window controls)
   // slides onscreen as an overlay when the mouse is hovered at the top of the
   // screen.
   scoped_ptr<ash::ImmersiveFullscreenController>
       immersive_fullscreen_controller_;
 #endif  // defined(USE_ASH)
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
+  DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_