Relanding focus manager refactoring

chrome/browser/views/shelf_item_dialog.cc

 // Copyright (c) 2006-2008 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/views/shelf_item_dialog.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
 #include "app/table_model_observer.h"
@@ skipping 241 matching lines @@
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_SHELFITEM_DIALOG_WIDTH_CHARS,
       IDS_SHELFITEM_DIALOG_HEIGHT_LINES));
 }
 
 bool ShelfItemDialog::AcceleratorPressed(
     const views::Accelerator& accelerator) {
   if (accelerator.GetKeyCode() == VK_ESCAPE) {
     window()->Close();
   } else if (accelerator.GetKeyCode() == VK_RETURN) {
-    views::FocusManager* fm = views::FocusManager::GetFocusManager(
-        GetWidget()->GetNativeView());
+    views::FocusManager* fm = GetFocusManager();
     if (fm->GetFocusedView() == url_table_) {
       // Return on table behaves like a double click.
       OnDoubleClick();
     } else if (fm->GetFocusedView()== url_field_) {
       // Return on the url field accepts the input if url is valid. If the URL
       // is invalid, focus is left on the url field.
       if (GetInputURL().is_valid()) {
         PerformModelChange();
         if (window())
           window()->Close();
@@ skipping 31 matching lines @@
     OnSelectionChanged();
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL ShelfItemDialog::GetInputURL() const {
   return GURL(URLFixerUpper::FixupURL(url_field_->text(), L""));
 }