STASH: Epic Experimental patch for toolkit-views App List on Mac

content/browser/web_contents/web_contents_view_mac.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.
 
 #import <Carbon/Carbon.h>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 141 matching lines @@
 }
 
 void WebContentsViewMac::SizeContents(const gfx::Size& size) {
   // TODO(brettw | japhet) This is a hack and should be removed.
   // See web_contents_view.h.
   // Note(erikchen): This method has /never/ worked correctly. I've removed the
   // previous implementation.
 }
 
 void WebContentsViewMac::Focus() {
+  if (delegate_ && delegate_->Focus())
+    return;
+
   NSWindow* window = [cocoa_view_.get() window];
   [window makeFirstResponder:GetContentNativeView()];
   if (![window isVisible])
     return;
   [window makeKeyAndOrderFront:nil];
 }
 
 void WebContentsViewMac::SetInitialFocus() {
   if (web_contents_->FocusLocationBarByDefault())
     web_contents_->SetFocusToLocationBar(false);
   else
     [[cocoa_view_.get() window] makeFirstResponder:GetContentNativeView()];
 }
 
 void WebContentsViewMac::StoreFocus() {
   // We're explicitly being asked to store focus, so don't worry if there's
   // already a view saved.
+  focus_tracker_.reset();
+  if (delegate_ && delegate_->StoreFocus())
+    return;
+
   focus_tracker_.reset(
       [[FocusTracker alloc] initWithWindow:[cocoa_view_ window]]);
 }
 
 void WebContentsViewMac::RestoreFocus() {
   // TODO(avi): Could we be restoring a view that's no longer in the key view
   // chain?
+  if (delegate_ && delegate_->RestoreFocus())
+    return;
+
   if (!(focus_tracker_.get() &&
         [focus_tracker_ restoreFocusInWindow:[cocoa_view_ window]])) {
     // Fall back to the default focus behavior if we could not restore focus.
     // TODO(shess): If location-bar gets focus by default, this will
     // select-all in the field.  If there was a specific selection in
     // the field when we navigated away from it, we should restore
     // that selection.
     SetInitialFocus();
   }
 
   focus_tracker_.reset(nil);
 }
 
 DropData* WebContentsViewMac::GetDropData() const {
   return [cocoa_view_ dropData];
 }
 
 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) {
   [cocoa_view_ setCurrentDragOperation: operation];
 }
 
 void WebContentsViewMac::GotFocus() {
   // This is only used in the views FocusManager stuff but it bleeds through
   // all subclasses. http://crbug.com/21875
 }
 
 // This is called when the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewMac::TakeFocus(bool reverse) {
+  if (delegate_ && delegate_->TakeFocus(reverse))
+    return;
+
   if (reverse) {
     [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()];
   } else {
     [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()];
   }
 }
 
 void WebContentsViewMac::ShowContextMenu(
     RenderFrameHost* render_frame_host,
     const ContextMenuParams& params) {
@@ skipping 352 matching lines @@
 // When the subviews require a layout, their size should be reset to the size
 // of this view. (It is possible for the size to get out of sync as an
 // optimization in preparation for an upcoming WebContentsView resize.
 // http://crbug.com/264207)
 - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
   for (NSView* subview in self.subviews)
     [subview setFrame:self.bounds];
 }
 
 @end