WebDialogs

chrome/browser/ui/browser.cc

 // 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1442 matching lines @@
                              WindowOpenDisposition disposition,
                              const gfx::Rect& initial_pos,
                              bool user_gesture) {
   AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture);
 }
 
 void Browser::CloseTabContents(WebContents* contents) {
   CloseContents(contents);
 }
 
-gfx::NativeWindow Browser::BrowserShowHtmlDialog(
-    HtmlDialogUIDelegate* delegate,
+gfx::NativeWindow Browser::BrowserShowWebDialog(
+    WebDialogDelegate* delegate,
     gfx::NativeWindow parent_window,
     DialogStyle style) {
   if (!parent_window)
     parent_window = window_->GetNativeHandle();
 
-  return browser::ShowHtmlDialog(parent_window,
-                                 profile_,
-                                 this,
-                                 delegate,
-                                 style);
+  return browser::ShowWebDialog(parent_window,
+                                profile_,
+                                this,
+                                delegate,
+                                style);
 }
 
 void Browser::BrowserRenderWidgetShowing() {
   RenderWidgetShowing();
 }
 
 void Browser::BookmarkBarSizeChanged(bool is_animating) {
   window_->ToolbarSizeChanged(is_animating);
 }
 
@@ skipping 616 matching lines @@
 void Browser::OpenTaskManager(bool highlight_background_resources) {
   content::RecordAction(UserMetricsAction("TaskManager"));
   if (highlight_background_resources)
     window_->ShowBackgroundPages();
   else
     window_->ShowTaskManager();
 }
 
 void Browser::OpenFeedbackDialog() {
   content::RecordAction(UserMetricsAction("Feedback"));
-  browser::ShowHtmlFeedbackView(this, std::string(), std::string());
+  browser::ShowWebFeedbackView(this, std::string(), std::string());
 }
 
 void Browser::ToggleBookmarkBar() {
   content::RecordAction(UserMetricsAction("ShowBookmarksBar"));
   window_->ToggleBookmarkBar();
 }
 
 void Browser::OpenBookmarkManager() {
   content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
   content::RecordAction(UserMetricsAction("ShowBookmarks"));
@@ skipping 3378 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }