| Index: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
|
| index f92d83307f3f35cf237abecc4af3d03b41d58953..e0099c2807ce1c57ddc877957044f8d4ef6385d4 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
|
| @@ -8,11 +8,11 @@
|
| #import <Cocoa/Cocoa.h>
|
| #include <vector>
|
|
|
| +#include "apps/shell_window.h"
|
| #include "base/memory/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #import "chrome/browser/ui/cocoa/browser_command_executor.h"
|
| #include "chrome/browser/ui/extensions/native_app_window.h"
|
| -#include "chrome/browser/ui/extensions/shell_window.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "extensions/common/draggable_region.h"
|
| #include "ui/gfx/rect.h"
|
| @@ -43,8 +43,8 @@ class SkRegion;
|
| // Cocoa bridge to AppWindow.
|
| class NativeAppWindowCocoa : public NativeAppWindow {
|
| public:
|
| - NativeAppWindowCocoa(ShellWindow* shell_window,
|
| - const ShellWindow::CreateParams& params);
|
| + NativeAppWindowCocoa(apps::ShellWindow* shell_window,
|
| + const apps::ShellWindow::CreateParams& params);
|
|
|
| // ui::BaseWindow implementation.
|
| virtual bool IsActive() const OVERRIDE;
|
| @@ -147,7 +147,7 @@ class NativeAppWindowCocoa : public NativeAppWindow {
|
| void UpdateDraggableRegionsForCustomDrag(
|
| const std::vector<extensions::DraggableRegion>& regions);
|
|
|
| - ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
|
| + apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
|
|
|
| bool has_frame_;
|
|
|
|
|