views: remove the last function abstraction from browser_dialogs.h

After commit faed95410a75: ("views: remove unnecessary EditSearchEngine()
function abstraction"), only CreateFindBar() function abstraction
remained in browser_dialogs.h, but like EditSearchEngine(), it is
unlikely this function will be used to be called by cross-platform
code, so it is not necessary keep it wrapping FindBarHost.

BrowserView can just depend on it like it does with many other
chrome/browser/ui/views/ header files already. This is also what
BrowserWindowCocoa does as well.

This in effect get rid of browser_dialogs.h header file finally.

BUG=None
R=sky@chromium.org

Review URL: https://codereview.chromium.org/1828363002

Cr-Commit-Position: refs/heads/master@{#383282}

9 files changed, 2 insertions, 42 deletions

diff --git a/chrome/browser/ui/views/BUILD.gn b/chrome/browser/ui/views/BUILD.gn
index 8831767..4cf4327 100644
--- a/chrome/browser/ui/views/BUILD.gn
+++ b/chrome/browser/ui/views/BUILD.gn
@@ -11,7 +11,6 @@ component("views") {
   sources = [
     "accelerator_table.cc",
     "accelerator_table.h",
-    "browser_dialogs.h",
     "chrome_views_export.h",
     "event_utils.cc",
     "event_utils.h",
diff --git a/chrome/browser/ui/views/browser_dialogs.h b/chrome/browser/ui/views/browser_dialogs.h
deleted file mode 100644
index 1aaec5c..0000000
--- a/chrome/browser/ui/views/browser_dialogs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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_VIEWS_BROWSER_DIALOGS_H_
-#define CHROME_BROWSER_UI_VIEWS_BROWSER_DIALOGS_H_
-
-// This file contains functions for running a variety of browser dialogs and
-// popups. The dialogs here are the ones that the caller does not need to
-// access the class of the popup. It allows us to break dependencies by
-// allowing the callers to not depend on the classes implementing the dialogs.
-// TODO: Make as many of these methods as possible cross platform, and move them
-// into chrome/browser/ui/browser_dialogs.h.
-
-class BrowserView;
-class FindBar;
-
-namespace chrome {
-
-// Creates and returns a find bar for the given browser window. See FindBarWin.
-FindBar* CreateFindBar(BrowserView* browser_view);
-
-}  // namespace chrome
-
-#endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_DIALOGS_H_
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 0c1e029..880c1ef 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/plugin_service.h"
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index a3fde9ec..3554aed 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -24,15 +24,6 @@
 
 using content::NativeWebKeyboardEvent;
 
-namespace chrome {
-
-// Declared in browser_dialogs.h so others don't have to depend on our header.
-FindBar* CreateFindBar(BrowserView* browser_view) {
-  return new FindBarHost(browser_view);
-}
-
-}  // namespace chrome
-
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarHost, public:
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 6da160e..f0e4383 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -64,13 +64,13 @@
 #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/edit_search_engine_dialog.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
+#include "chrome/browser/ui/views/find_bar_host.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
@@ -1520,7 +1520,7 @@ WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
 }
 
 FindBar* BrowserView::CreateFindBar() {
-  return chrome::CreateFindBar(this);
+  return new FindBarHost(this);
 }
 
 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() {
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index c488fb8..bb54d96 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -34,7 +34,6 @@
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/autofill/save_card_icon_view.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
index c9f7064..213aee7 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/user_manager.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/guest_view/browser/guest_view_manager.h"
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index e97dac1..b780771 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/new_task_manager_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/chrome_browser_ui_views.gyp b/chrome/chrome_browser_ui_views.gyp
index 160148c..d2aa773 100644
--- a/chrome/chrome_browser_ui_views.gyp
+++ b/chrome/chrome_browser_ui_views.gyp
@@ -33,7 +33,6 @@
       'sources': [
         'browser/ui/views/accelerator_table.cc',
         'browser/ui/views/accelerator_table.h',
-        'browser/ui/views/browser_dialogs.h',
         'browser/ui/views/chrome_views_export.h',
         'browser/ui/views/event_utils.cc',
         'browser/ui/views/event_utils.h',