Views: Override GetInitiallyFocusedView() for ConstrainedHtmlDelegateViews.

chrome/browser/ui/views/constrained_html_delegate_views.cc

 // Copyright (c) 2011 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/webui/constrained_html_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
@@ skipping 17 matching lines @@
   // ConstrainedHtmlUIDelegate interface.
   virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() OVERRIDE;
   virtual void OnDialogCloseFromWebUI() OVERRIDE;
   virtual void ReleaseTabContentsOnDialogClose() OVERRIDE;
   virtual ConstrainedWindow* window() OVERRIDE { return window_; }
   virtual TabContentsWrapper* tab() OVERRIDE {
     return html_tab_contents_.get();
   }
 
   // views::WidgetDelegate interface.
+  virtual views::View* GetInitiallyFocusedView() OVERRIDE {
+    return GetFocusView();
+  }
   virtual bool CanResize() const OVERRIDE { return true; }
-  virtual views::View* GetContentsView() OVERRIDE {
-    return this;
-  }
   virtual void WindowClosing() OVERRIDE {
     if (!closed_via_webui_)
       html_delegate_->OnDialogClosed(std::string());
   }
   virtual views::Widget* GetWidget() OVERRIDE {
     return View::GetWidget();
   }
   virtual const views::Widget* GetWidget() const OVERRIDE {
     return View::GetWidget();
   }
-
   virtual string16 GetWindowTitle() const OVERRIDE {
     return html_delegate_->GetDialogTitle();
   }
+  virtual views::View* GetContentsView() OVERRIDE {
+    return this;
+  }
 
   // HtmlDialogTabContentsDelegate interface.
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) OVERRIDE {}
   virtual void CloseContents(TabContents* source) OVERRIDE {
     window_->CloseConstrainedWindow();
   }
 
   // Overridden from TabContentsContainer.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size;
@@ skipping 76 matching lines @@
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
     TabContentsWrapper* container) {
   ConstrainedHtmlDelegateViews* constrained_delegate =
       new ConstrainedHtmlDelegateViews(profile, delegate);
   ConstrainedWindow* constrained_window =
       new ConstrainedWindowViews(container, constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_delegate;
 }