Fix a bug where the HTML content in a v2 app window wouldn't be initially focused.

chrome/browser/ui/cocoa/extensions/native_app_window_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/cocoa/extensions/native_app_window_cocoa.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 @interface NSWindow (NSPrivateApis)
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
@@ skipping 229 matching lines @@
   InstallView();
 
   [[window_controller_ window] setDelegate:window_controller_];
   [window_controller_ setAppWindow:this];
 
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryCocoa(
       shell_window_->profile(),
       window,
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       shell_window));
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
+                 content::Source<content::NavigationController>(
+                     &web_contents()->GetController()));
 }
 
 void NativeAppWindowCocoa::InstallView() {
   NSView* view = web_contents()->GetView()->GetNativeView();
   if (has_frame_) {
     [view setFrame:[[window() contentView] bounds]];
     [[window() contentView] addSubview:view];
     if (!max_size_.IsEmpty() && min_size_ == max_size_) {
       [[window() standardWindowButton:NSWindowZoomButton] setEnabled:NO];
       [window() setShowsResizeIndicator:NO];
@@ skipping 356 matching lines @@
     scoped_nsobject<NSView> controlRegion(
         [[ControlRegionView alloc] initWithAppWindow:this]);
     [controlRegion setFrame:NSMakeRect(iter->x(),
                                        webViewHeight - iter->bottom(),
                                        iter->width(),
                                        iter->height())];
     [webView addSubview:controlRegion];
   }
 }
 
+void NativeAppWindowCocoa::Observe(int type,
+                            const content::NotificationSource& source,
+                            const content::NotificationDetails& details) {

[Avi (use Gerrit), 2013/01/14 17:10:03]

bad indentation

+  if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
+    if (content::RenderWidgetHostView* rwhv =
+            web_contents()->GetRenderWidgetHostView()) {
+      rwhv->Focus();

[Avi (use Gerrit), 2013/01/14 17:10:03]

I'm not clear on why this wouldn't be working. Is it because the window is
frameless?

[jeremya, 2013/01/15 05:49:52]

The bug happens even for non-frameless windows.

I think Browser::UpdateUIForNavigationInTab handles this for normal browser
windows (it uses web_contents()->Focus(), which does the same thing -- I've
updated this code to do that).

+    }
+    return;
+  }
+  NOTREACHED();
+}
+
 void NativeAppWindowCocoa::FlashFrame(bool flash) {
   if (flash) {
     attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest];
   } else {
     [NSApp cancelUserAttentionRequest:attention_request_id_];
     attention_request_id_ = 0;
   }
 }
 
 bool NativeAppWindowCocoa::IsAlwaysOnTop() const {
@@ skipping 91 matching lines @@
   CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]);
   return static_cast<ShellNSWindow*>(window);
 }
 
 // static
 NativeAppWindow* NativeAppWindow::Create(
     ShellWindow* shell_window,
     const ShellWindow::CreateParams& params) {
   return new NativeAppWindowCocoa(shell_window, params);
 }