| Index: apps/ui/views/native_app_window_views.h
|
| diff --git a/apps/ui/views/native_app_window_views.h b/apps/ui/views/native_app_window_views.h
|
| index 453542fd8d7819058318582cfae1f63dcd23ab24..ad1fb7d876c0c0df336debd39e21a46d0513b610 100644
|
| --- a/apps/ui/views/native_app_window_views.h
|
| +++ b/apps/ui/views/native_app_window_views.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
|
| #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
|
|
|
| -#include "apps/ui/native_app_window.h"
|
| +#include "apps/app_window.h"
|
| #include "base/observer_list.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| +#include "extensions/browser/app_window/native_app_window.h"
|
| #include "extensions/browser/app_window/size_constraints.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
|
| @@ -42,7 +43,7 @@ class AppWindowFrameView;
|
|
|
| // A NativeAppWindow backed by a views::Widget. This class may be used alone
|
| // as a stub or subclassed (for example, ChromeNativeAppWindowViews).
|
| -class NativeAppWindowViews : public NativeAppWindow,
|
| +class NativeAppWindowViews : public extensions::NativeAppWindow,
|
| public content::WebContentsObserver,
|
| public views::WidgetDelegateView,
|
| public views::WidgetObserver {
|
|
|