Rename BaseNativeAppWindowViews and NativeAppWindowViews

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

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.h
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
similarity index 86%
rename from chrome/browser/ui/views/apps/native_app_window_views.h
rename to chrome/browser/ui/views/apps/chrome_native_app_window_views.h
index f9db9adb04cab5f7127af5f214b09561effa541c..b66cf680ce4b3668b01a5d0ce7c34dcdfbf44fa7 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
@@ -2,10 +2,10 @@
 // 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"
 
@@ -21,11 +21,11 @@ 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(); }
 
@@ -84,7 +84,7 @@ class NativeAppWindowViews : public BaseNativeAppWindowViews,
   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;
@@ -115,7 +115,7 @@ class NativeAppWindowViews : public BaseNativeAppWindowViews,
   // 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_