| Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| index 340266b321d7c7f6db3bdc30ed063c4e39a1ed85..4acf8b29d5604c828962891c488be3bed6d0d3d1 100644
|
| --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| @@ -8,21 +8,17 @@
|
| #import <Cocoa/Cocoa.h>
|
| #include <vector>
|
|
|
| -#include "apps/app_window.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #import "chrome/browser/ui/cocoa/browser_command_executor.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| +#include "extensions/browser/app_window/app_window.h"
|
| #include "extensions/browser/app_window/native_app_window.h"
|
| #include "extensions/browser/app_window/size_constraints.h"
|
| #include "extensions/common/draggable_region.h"
|
| #include "ui/base/accelerators/accelerator_manager.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| -namespace apps {
|
| -class AppWindow;
|
| -}
|
| -
|
| class ExtensionKeybindingRegistryCocoa;
|
| class NativeAppWindowCocoa;
|
| @class ShellNSWindow;
|
| @@ -51,8 +47,8 @@ class SkRegion;
|
| class NativeAppWindowCocoa : public extensions::NativeAppWindow,
|
| public content::WebContentsObserver {
|
| public:
|
| - NativeAppWindowCocoa(apps::AppWindow* app_window,
|
| - const apps::AppWindow::CreateParams& params);
|
| + NativeAppWindowCocoa(extensions::AppWindow* app_window,
|
| + const extensions::AppWindow::CreateParams& params);
|
|
|
| // ui::BaseWindow implementation.
|
| virtual bool IsActive() const OVERRIDE;
|
| @@ -187,7 +183,7 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
|
| // Hides the window unconditionally. Used by Hide and HideWithApp.
|
| void HideWithoutMarkingHidden();
|
|
|
| - apps::AppWindow* app_window_; // weak - AppWindow owns NativeAppWindow.
|
| + extensions::AppWindow* app_window_; // weak - AppWindow owns NativeAppWindow.
|
|
|
| bool has_frame_;
|
|
|
|
|