extensions: Extract the dependency on browser_view from extension_input_api.cc.

BUG=125846
R=aa@chromium.org,ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10908053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154950 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 50 insertions, 17 deletions

diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index 67c5cd5..be4feb5 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -10,13 +10,10 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/key_identifier_conversion_views.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/top_level_widget.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "ui/base/events/event.h"
 #include "ui/views/ime/input_method.h"
-#include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ -63,18 +60,6 @@ uint16 UnicodeIdentifierStringToInt(const std::string& key_identifier) {
   return character;
 }
 
-views::Widget* GetTopLevelWidget(Browser* browser) {
-  if (!browser)
-    return NULL;
-
-  BrowserWindow* window = browser->window();
-  if (!window)
-    return NULL;
-
-  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
-  return browser_view ? browser_view->GetWidget() : NULL;
-}
-
 }  // namespace
 
 bool SendKeyboardEventInputFunction::RunImpl() {
@@ -117,7 +102,8 @@ bool SendKeyboardEventInputFunction::RunImpl() {
     return false;
   }
 
-  views::Widget* widget = GetTopLevelWidget(GetCurrentBrowser());
+  views::Widget* widget =
+      chrome::GetTopLevelWidgetForBrowser(GetCurrentBrowser());
   if (!widget) {
     error_ = kNoValidRecipientError;
     return false;
diff --git a/chrome/browser/ui/top_level_widget.h b/chrome/browser/ui/top_level_widget.h
new file mode 100644
index 0000000..df9b2c2d
--- /dev/null
+++ b/chrome/browser/ui/top_level_widget.h
@@ -0,0 +1,20 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_TOP_LEVEL_WIDGET_H_
+#define CHROME_BROWSER_UI_TOP_LEVEL_WIDGET_H_
+
+class Browser;
+
+namespace views {
+class Widget;
+}
+
+namespace chrome {
+
+views::Widget* GetTopLevelWidgetForBrowser(Browser* browser);
+
+}  // namespace chrome
+
+#endif  // CHROME_BROWSER_UI_TOP_LEVEL_WIDGET_H_
diff --git a/chrome/browser/ui/views/top_level_widget_views.cc b/chrome/browser/ui/views/top_level_widget_views.cc
new file mode 100644
index 0000000..a625492
--- /dev/null
+++ b/chrome/browser/ui/views/top_level_widget_views.cc
@@ -0,0 +1,25 @@
+// 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/top_level_widget.h"
+
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "ui/views/widget/widget.h"
+
+namespace chrome {
+
+views::Widget* GetTopLevelWidgetForBrowser(Browser* browser) {
+  if (!browser)
+    return NULL;
+
+  BrowserWindow* window = browser->window();
+  if (!window)
+    return NULL;
+
+  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
+  return browser_view ? browser_view->GetWidget() : NULL;
+}
+
+}  // namespace chrome
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index beda654..4c1c2c9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3100,6 +3100,7 @@
         'browser/ui/toolbar/toolbar_model_delegate.h',
         'browser/ui/toolbar/wrench_menu_model.cc',
         'browser/ui/toolbar/wrench_menu_model.h',
+        'browser/ui/top_level_widget.h',
         'browser/ui/uma_browsing_activity_observer.cc',
         'browser/ui/uma_browsing_activity_observer.h',
         'browser/ui/uninstall_browser_prompt.h',
@@ -3449,6 +3450,7 @@
         'browser/ui/views/theme_helpers.h',
         'browser/ui/views/toolbar_view.cc',
         'browser/ui/views/toolbar_view.h',
+        'browser/ui/views/top_level_widget_views.cc',
         'browser/ui/views/unhandled_keyboard_event_handler.cc',
         'browser/ui/views/unhandled_keyboard_event_handler.h',
         'browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc',