| Index: chrome/browser/ui/panels/panel_window_controller_cocoa.h
|
| diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.h b/chrome/browser/ui/panels/panel_window_controller_cocoa.h
|
| index af5a15bf7fc3cbde913fd3d114c3a5fc305e28e8..6f53deaefb61be90141e0260f0dededfa2536e7f 100644
|
| --- a/chrome/browser/ui/panels/panel_window_controller_cocoa.h
|
| +++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.h
|
| @@ -14,15 +14,13 @@
|
| #include "base/memory/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/time.h"
|
| -#import "chrome/browser/ui/cocoa/browser_command_executor.h"
|
| #import "chrome/browser/ui/cocoa/chrome_browser_window.h"
|
| #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
|
| #import "chrome/browser/ui/cocoa/themed_window.h"
|
| #import "chrome/browser/ui/cocoa/tracking_area.h"
|
| #include "chrome/browser/ui/panels/panel.h"
|
|
|
| -@class FindBarCocoaController;
|
| -class NativePanelCocoa;
|
| +class PanelCocoa;
|
| @class PanelTitlebarViewCocoa;
|
|
|
| @interface PanelWindowCocoaImpl : ChromeBrowserWindow {
|
| @@ -31,11 +29,10 @@ class NativePanelCocoa;
|
|
|
| @interface PanelWindowControllerCocoa : NSWindowController
|
| <NSWindowDelegate,
|
| - NSAnimationDelegate,
|
| - BrowserCommandExecutor> {
|
| + NSAnimationDelegate> {
|
| @private
|
| IBOutlet PanelTitlebarViewCocoa* titlebar_view_;
|
| - scoped_ptr<NativePanelCocoa> windowShim_;
|
| + scoped_ptr<PanelCocoa> windowShim_;
|
| scoped_nsobject<NSString> pendingWindowTitle_;
|
| scoped_nsobject<TabContentsController> contentsController_;
|
| NSViewAnimation* boundsAnimation_; // Lifetime controlled manually, needs
|
| @@ -54,7 +51,7 @@ class NativePanelCocoa;
|
| }
|
|
|
| // Load the window nib and do any Cocoa-specific initialization.
|
| -- (id)initWithPanel:(NativePanelCocoa*)window;
|
| +- (id)initWithPanel:(PanelCocoa*)window;
|
|
|
| - (ui::ThemeProvider*)themeProvider;
|
| - (ThemedWindowStyle)themedWindowStyle;
|
| @@ -77,10 +74,6 @@ class NativePanelCocoa;
|
| - (void)updateThrobber:(BOOL)shouldSpin;
|
| - (void)updateTitleBarMinimizeRestoreButtonVisibility;
|
|
|
| -// Adds the FindBar controller's view to this Panel. Must only be
|
| -// called once per PanelWindowControllerCocoa.
|
| -- (void)addFindBar:(FindBarCocoaController*)findBarCocoaController;
|
| -
|
| // Initiate the closing of the panel, starting from the platform-independent
|
| // layer. This will take care of PanelManager, other panels and close the
|
| // native window at the end.
|
| @@ -115,11 +108,6 @@ class NativePanelCocoa;
|
| // Minimized/Restored states.
|
| - (void)onTitlebarMouseClicked:(int)modifierFlags;
|
|
|
| -// Executes the command in the context of the current browser.
|
| -// |command| is an integer value containing one of the constants defined in the
|
| -// "chrome/app/chrome_command_ids.h" file.
|
| -- (void)executeCommand:(int)command;
|
| -
|
| // NSAnimationDelegate method, invoked when bounds animation is finished.
|
| - (void)animationDidEnd:(NSAnimation*)animation;
|
| // Terminates current bounds animation, if any.
|
|
|