chrome: Refactor the way to show the feedback ui and move it into chrome namespace.

BUG=133088
TBR=ben@chromium.org

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

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

chrome/browser/autofill/autofill_feedback_infobar_delegate.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/autofill/autofill_feedback_infobar_delegate.h"
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/feedback/proto/extension.pb.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/webui/feedback_ui.h"
-#include "chrome/browser/feedback/proto/extension.pb.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
@@ -45,7 +45,7 @@ string16 AutofillFeedbackInfoBarDelegate::GetLinkText() const {
 
 bool AutofillFeedbackInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-  browser::ShowWebFeedbackView(
+  chrome::ShowFeedbackPage(
       browser::FindBrowserWithWebContents(owner()->web_contents()),
       feedback_message_,
       std::string(kCategoryTagAutofill));

chrome/browser/ui/browser.cc

@@ -140,7 +140,6 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/unload_controller.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
-#include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"

chrome/browser/ui/browser_commands.cc

@@ -38,6 +38,7 @@
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ -49,7 +50,6 @@
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
@@ -838,7 +838,7 @@ void OpenTaskManager(Browser* browser, bool highlight_background_resources) {
 
 void OpenFeedbackDialog(Browser* browser) {
   content::RecordAction(UserMetricsAction("Feedback"));
-  browser::ShowWebFeedbackView(browser, std::string(), std::string());
+  chrome::ShowFeedbackPage(browser, std::string(), std::string());
 }
 
 void ToggleBookmarkBar(Browser* browser) {

chrome/browser/ui/chrome_pages.h

@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_CHROME_PAGES_H_
 #define CHROME_BROWSER_UI_CHROME_PAGES_H_
 
+#include <string>
+
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/content_settings_types.h"
 
@@ -35,6 +37,9 @@ void ShowHistory(Browser* browser);
 void ShowDownloads(Browser* browser);
 void ShowExtensions(Browser* browser);
 void ShowConflicts(Browser* browser);
+void ShowFeedbackPage(Browser* browser,
+                      const std::string& description_template,
+                      const std::string& category_tag);
 
 void ShowHelp(Browser* browser, HelpSource source);
 

chrome/browser/ui/views/frame/browser_view.cc

@@ -71,7 +71,6 @@
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/browser/ui/views/update_recommended_message_box.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
-#include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/ui/views/sad_tab_view.cc

@@ -12,7 +12,7 @@
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/webui/feedback_ui.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
@@ -121,7 +121,7 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) {
         content::PAGE_TRANSITION_LINK, false);
     web_contents_->OpenURL(params);
   } else if (source == feedback_link_) {
-    browser::ShowWebFeedbackView(
+    chrome::ShowFeedbackPage(
         browser::FindBrowserWithWebContents(web_contents_),
         l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE),
         std::string(kCategoryTagCrash));

chrome/browser/ui/webui/feedback_ui.cc

@@ -29,6 +29,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -147,12 +148,11 @@ int GetIndexOfFeedbackTab(Browser* browser) {
 
 }  // namespace
 
+namespace chrome {
 
-namespace browser {
-
-void ShowWebFeedbackView(Browser* browser,
-                         const std::string& description_template,
-                         const std::string& category_tag) {
+void ShowFeedbackPage(Browser* browser,
+                      const std::string& description_template,
+                      const std::string& category_tag) {
 #if defined(OS_CHROMEOS)
   // Grab the timestamp before we do anything else - this is crucial to help
   // diagnose some hardware issues.
@@ -206,7 +206,7 @@ void ShowWebFeedbackView(Browser* browser,
   chrome::ShowSingletonTab(browser, GURL(feedback_url));
 }
 
-}  // namespace browser
+}  // namespace chrome
 
 // The handler for Javascript messages related to the "bug report" dialog
 class FeedbackHandler : public WebUIMessageHandler,

chrome/browser/ui/webui/feedback_ui.h

@@ -7,15 +7,10 @@
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
-class Browser;
-
-namespace browser {
-void ShowWebFeedbackView(Browser* browser,
-                         const std::string& description_template,
-                         const std::string& category_tag);
-}  // namespace browser
+class FilePath;
 
 class FeedbackUI : public ui::WebDialogUI {
  public: