| Index: chrome/browser/ui/views/apps/native_app_window_views.h
|
| diff --git a/chrome/browser/ui/views/extensions/native_app_window_views.h b/chrome/browser/ui/views/apps/native_app_window_views.h
|
| similarity index 95%
|
| rename from chrome/browser/ui/views/extensions/native_app_window_views.h
|
| rename to chrome/browser/ui/views/apps/native_app_window_views.h
|
| index 138a9e0fa91d3f35d96fbbd70c22fba524e7c271..d852a67d6b326e5bd0cc38a0025dad52b30eb4f0 100644
|
| --- a/chrome/browser/ui/views/extensions/native_app_window_views.h
|
| +++ b/chrome/browser/ui/views/apps/native_app_window_views.h
|
| @@ -2,12 +2,12 @@
|
| // 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_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
|
| -#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
|
| +#ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
|
| +#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
|
|
|
| +#include "apps/native_app_window.h"
|
| #include "apps/shell_window.h"
|
| #include "base/observer_list.h"
|
| -#include "chrome/browser/ui/extensions/native_app_window.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "third_party/skia/include/core/SkRegion.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -36,7 +36,7 @@ namespace views {
|
| class WebView;
|
| }
|
|
|
| -class NativeAppWindowViews : public NativeAppWindow,
|
| +class NativeAppWindowViews : public apps::NativeAppWindow,
|
| public views::WidgetDelegateView,
|
| public views::WidgetObserver,
|
| public content::WebContentsObserver {
|
| @@ -182,4 +182,4 @@ class NativeAppWindowViews : public NativeAppWindow,
|
| DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_
|
| +#endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
|
|
|