| Index: chrome/browser/ui/gtk/apps/native_app_window_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h b/chrome/browser/ui/gtk/apps/native_app_window_gtk.h
|
| similarity index 95%
|
| rename from chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
|
| rename to chrome/browser/ui/gtk/apps/native_app_window_gtk.h
|
| index ce5ece9b0ed1ec5c7cb029350c9ad565e61ad285..4586361cb795246e990e5c8460bd5e9105212027 100644
|
| --- a/chrome/browser/ui/gtk/extensions/native_app_window_gtk.h
|
| +++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_GTK_EXTENSIONS_NATIVE_APP_WINDOW_GTK_H_
|
| -#define CHROME_BROWSER_UI_GTK_EXTENSIONS_NATIVE_APP_WINDOW_GTK_H_
|
| +#ifndef CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
|
| +#define CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
|
|
|
| #include <gtk/gtk.h>
|
|
|
| +#include "apps/native_app_window.h"
|
| #include "apps/shell_window.h"
|
| #include "base/observer_list.h"
|
| #include "base/timer/timer.h"
|
| -#include "chrome/browser/ui/extensions/native_app_window.h"
|
| #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
|
| #include "third_party/skia/include/core/SkRegion.h"
|
| #include "ui/base/gtk/gtk_signal.h"
|
| @@ -25,7 +25,7 @@ namespace extensions {
|
| class Extension;
|
| }
|
|
|
| -class NativeAppWindowGtk : public NativeAppWindow,
|
| +class NativeAppWindowGtk : public apps::NativeAppWindow,
|
| public ExtensionViewGtk::Container,
|
| public ui::ActiveWindowWatcherXObserver {
|
| public:
|
| @@ -167,4 +167,4 @@ class NativeAppWindowGtk : public NativeAppWindow,
|
| DISALLOW_COPY_AND_ASSIGN(NativeAppWindowGtk);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_GTK_EXTENSIONS_NATIVE_APP_WINDOW_GTK_H_
|
| +#endif // CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
|
|
|