[Panel refactor] Deprecate old panels.

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
-#import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
-#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
-#include "chrome/browser/ui/panels/native_panel_cocoa.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
+#include "chrome/browser/ui/panels/panel_cocoa.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
@@ skipping 367 matching lines @@
   bottomRightCursorRect_.origin.y = NSMinY(bounds);
   [self addCursorRect:bottomRightCursorRect_ cursor:northWestSouthEastCursor_];
 
   // Bottom left corner.
   bottomLeftCursorRect_ = bottomRightCursorRect_;
   bottomLeftCursorRect_.origin.x = NSMinX(bounds);
   [self addCursorRect:bottomLeftCursorRect_ cursor:northEastSouthWestCursor_];
 }
 @end
 
+// ChromeEventProcessingWindow expects its controller to implement the
+// BrowserCommandExecutor protocol.
+@interface PanelWindowControllerCocoa (InternalAPI) <BrowserCommandExecutor>
+
+// BrowserCommandExecutor methods.
+- (void)executeCommand:(int)command;
+
+@end
+
+@implementation PanelWindowControllerCocoa (InternalAPI)
+
+// This gets called whenever a browser-specific keyboard shortcut is performed
+// in the Panel window. We simply swallow all those events.
+- (void)executeCommand:(int)command {}
+
+@end
+
 @implementation PanelWindowControllerCocoa
 
-- (id)initWithPanel:(NativePanelCocoa*)window {
+- (id)initWithPanel:(PanelCocoa*)window {
   NSString* nibpath =
       [base::mac::FrameworkBundle() pathForResource:@"Panel" ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     windowShim_.reset(window);
     animateOnBoundsChange_ = YES;
     canBecomeKeyWindow_ = YES;
     activationRequestedByPanel_ = NO;
     contentsController_.reset(
         [[TabContentsController alloc] initWithContents:nil]);
   }
@@ skipping 155 matching lines @@
 
   [self updateIcon];
 }
 
 - (void)updateTitleBarMinimizeRestoreButtonVisibility {
   Panel* panel = windowShim_->panel();
   [titlebar_view_ setMinimizeButtonVisibility:panel->CanMinimize()];
   [titlebar_view_ setRestoreButtonVisibility:panel->CanRestore()];
 }
 
-- (void)addFindBar:(FindBarCocoaController*)findBarCocoaController {
-  NSView* contentView = [[self window] contentView];
-  [contentView addSubview:[findBarCocoaController view]];
-
-  CGFloat maxY = NSMaxY([contentView frame]);
-  CGFloat maxWidth = NSWidth([contentView frame]);
-  [findBarCocoaController positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
-}
-
 - (void)webContentsInserted:(WebContents*)contents {
   [contentsController_ changeWebContents:contents];
   DCHECK(![[contentsController_ view] isHidden]);
 }
 
 - (void)webContentsDetached:(WebContents*)contents {
   DCHECK(contents == [contentsController_ webContents]);
   [contentsController_ changeWebContents:nil];
   [[contentsController_ view] setHidden:YES];
 }
 
 - (PanelTitlebarViewCocoa*)titlebarView {
   return titlebar_view_;
 }
 
 // Called to validate menu and toolbar items when this window is key. All the
 // items we care about have been set with the |-commandDispatch:| or
 // |-commandDispatchUsingKeyModifiers:| actions and a target of FirstResponder
 // in IB. If it's not one of those, let it continue up the responder chain to be
 // handled elsewhere.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
   BOOL enable = NO;
   if (action == @selector(commandDispatch:) ||
       action == @selector(commandDispatchUsingKeyModifiers:)) {
     NSInteger tag = [item tag];
-    CommandUpdater* command_updater =
-        windowShim_->panel()->command_updater();
+    CommandUpdater* command_updater = windowShim_->panel()->command_updater();
     if (command_updater->SupportsCommand(tag)) {
       enable = command_updater->IsCommandEnabled(tag);
-      // Disable commands that do not apply to Panels.
-      switch (tag) {
-        case IDC_CLOSE_TAB:
-        case IDC_FULLSCREEN:
-        case IDC_PRESENTATION_MODE:
-        case IDC_SHOW_SYNC_SETUP:
-          enable = NO;
-          break;
-        default:
-          // Special handling for the contents of the Text Encoding submenu. On
-          // Mac OS, instead of enabling/disabling the top-level menu item, we
-          // enable/disable the submenu's contents (per Apple's HIG).
-          EncodingMenuController encoding_controller;
-          if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) {
-            enable &= command_updater->IsCommandEnabled(IDC_ENCODING_MENU) ?
-                YES : NO;
-          }
+      // Special handling for the contents of the Text Encoding submenu. On
+      // Mac OS, instead of enabling/disabling the top-level menu item, we
+      // enable/disable the submenu's contents (per Apple's HIG).
+      EncodingMenuController encoding_controller;
+      if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) {
+        enable &= command_updater->IsCommandEnabled(IDC_ENCODING_MENU) ?
+            YES : NO;
       }
     }
   }
   return enable;
 }
 
 // Called when the user picks a menu or toolbar item when this window is key.
 // Calls through to the panel object to execute the command. This assumes that
 // the command is supported and doesn't check, otherwise it would have been
 // disabled in the UI in validateUserInterfaceItem:.
 - (void)commandDispatch:(id)sender {
   DCHECK(sender);
   windowShim_->panel()->ExecuteCommandWithDisposition([sender tag],
                                                       CURRENT_TAB);
 }
 
 // Same as |-commandDispatch:|, but executes commands using a disposition
 // determined by the key flags.
 - (void)commandDispatchUsingKeyModifiers:(id)sender {
   DCHECK(sender);
   NSEvent* event = [NSApp currentEvent];
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEventWithFlags(
           event, [event modifierFlags]);
   windowShim_->panel()->ExecuteCommandWithDisposition(
       [sender tag], disposition);
 }
 
-- (void)executeCommand:(int)command {
-  windowShim_->panel()->ExecuteCommandIfEnabled(command);
-}
-
 // Handler for the custom Close button.
 - (void)closePanel {
   windowShim_->panel()->Close();
 }
 
 // Handler for the custom Minimize button.
 - (void)minimizeButtonClicked:(int)modifierFlags {
   Panel* panel = windowShim_->panel();
   panel->OnMinimizeButtonClicked((modifierFlags & NSShiftKeyMask) ?
                                  panel::APPLY_TO_ALL : panel::NO_MODIFIER);
@@ skipping 36 matching lines @@
 }
 
 // When windowShouldClose returns YES (or if controller receives direct 'close'
 // signal), window will be unconditionally closed. Clean up.
 - (void)windowWillClose:(NSNotification*)notification {
   DCHECK(!windowShim_->panel()->GetWebContents());
   // Avoid callbacks from a nonblocking animation in progress, if any.
   [self terminateBoundsAnimation];
   windowShim_->DidCloseNativeWindow();
   // Call |-autorelease| after a zero-length delay to avoid deadlock from
-  // code in the current run loop that waits on BROWSER_CLOSED notification.
+  // code in the current run loop that waits on PANEL_CLOSED notification.
   // The notification is sent when this object is freed, but this object
   // cannot be freed until the current run loop completes.
   [self performSelector:@selector(autorelease)
              withObject:nil
              afterDelay:0];
 }
 
 - (void)startDrag:(NSPoint)mouseLocation {
   // Convert from Cocoa's screen coordinates to platform-indepedent screen
   // coordinates because PanelManager method takes platform-indepedent screen
@@ skipping 277 matching lines @@
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   NSRect contentRect = [[[self window] contentView] convertRect:frameRect
                                                        fromView:nil];
   contentRect.size.height -= panel::kTitlebarHeight;
   if (contentRect.size.height < 0)
     contentRect.size.height = 0;
   return contentRect;
 }
 
 @end