Rename BaseNativeAppWindowViews and NativeAppWindowViews

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

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
similarity index 64%
rename from chrome/browser/ui/views/apps/native_app_window_views_win.h
rename to chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
index 01eb1a299c28e0159dfb4db23990fc16595012fe..6c1a5c0836d3a5f8d67b5c6b8c6381ebde5de7c4 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views_win.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
@@ -2,17 +2,17 @@
 // 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_WIN_H_
-#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_WIN_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
+#define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_
 
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/views/apps/native_app_window_views.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
 
 // Windows-specific parts of the views-backed native shell window implementation
 // for packaged apps.
-class NativeAppWindowViewsWin : public NativeAppWindowViews {
+class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews {
  public:
-  NativeAppWindowViewsWin();
+  ChromeNativeAppWindowViewsWin();
 
  private:
   void ActivateParentDesktopIfNecessary();
@@ -22,7 +22,7 @@ class NativeAppWindowViewsWin : public NativeAppWindowViews {
 
   HWND GetNativeAppWindowHWND() const;
 
-  // Overridden from NativeAppWindowViews:
+  // Overridden from ChromeNativeAppWindowViews:
   virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
                                   views::Widget* widget) OVERRIDE;
   virtual void InitializeDefaultWindow(
@@ -35,12 +35,12 @@ class NativeAppWindowViewsWin : public NativeAppWindowViews {
   // Overridden from apps::NativeAppWindow:
   virtual void UpdateShelfMenu() OVERRIDE;
 
-  base::WeakPtrFactory<NativeAppWindowViewsWin> weak_ptr_factory_;
+  base::WeakPtrFactory<ChromeNativeAppWindowViewsWin> weak_ptr_factory_;
 
   // The Windows Application User Model ID identifying the app.
   base::string16 app_model_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViewsWin);
+  DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsWin);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_WIN_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_