WebDialogs

chrome/browser/ui/webui/task_manager/task_manager_dialog.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/webui/task_manager/task_manager_dialog.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/dialog_style.h"
-#include "chrome/browser/ui/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/web_dialog_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/google_chrome_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/views/widget/widget.h"
 #endif
 
 namespace {
 
 // The minimum size of task manager window in px.
 const int kMinimumTaskManagerWidth = 640;
 const int kMinimumTaskManagerHeight = 480;
 
 }  // namespace
 
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
 
-class TaskManagerDialogImpl : public HtmlDialogUIDelegate {
+class TaskManagerDialogImpl : public WebDialogDelegate {
  public:
   TaskManagerDialogImpl();
 
   static void Show(bool is_background_page_mode);
   static TaskManagerDialogImpl* GetInstance();
 
  protected:
   friend struct DefaultSingletonTraits<TaskManagerDialogImpl>;
   virtual ~TaskManagerDialogImpl();
 
   void OnCloseDialog();
 
-  // Overridden from HtmlDialogUIDelegate:
+  // Overridden from WebDialogDelegate:
   virtual ui::ModalType GetDialogModalType() const OVERRIDE {
     return ui::MODAL_TYPE_NONE;
   }
   virtual string16 GetDialogTitle() const OVERRIDE {
     return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_TITLE);
   }
   virtual std::string GetDialogName() const OVERRIDE {
     return prefs::kTaskManagerWindowPlacement;
   }
   virtual GURL GetDialogContentURL() const OVERRIDE {
@@ skipping 57 matching lines @@
                                   prefs::kTaskManagerWindowPlacement);
       DictionaryValue* placement_pref = update.Get();
       placement_pref->SetInteger("width", dialog_size.width());
       placement_pref->SetInteger("height", dialog_size.height());
     }
   }
 #endif
 
  private:
   void ShowDialog(bool is_background_page_mode);
-  void OpenHtmlDialog();
+  void OpenWebDialog();
 
   int show_count_;
 
   gfx::NativeWindow window_;
   bool is_background_page_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerDialogImpl);
 };
 
 // ****************************************************
@@ skipping 26 matching lines @@
 #if defined(OS_CHROMEOS)
     // Closes current TaskManager and Opens new one.
     views::Widget::GetWidgetForNativeWindow(window_)->Close();
 #else
     // TODO(yoshiki): Supports the other platforms.
     platform_util::ActivateWindow(window_);
     return;
 #endif
   }
   is_background_page_mode_ = is_background_page_mode;
-  OpenHtmlDialog();
+  OpenWebDialog();
   ++show_count_;
 }
 
 void TaskManagerDialogImpl::OnCloseDialog() {
   if (show_count_ > 0)
     --show_count_;
 }
 
-void TaskManagerDialogImpl::OpenHtmlDialog() {
+void TaskManagerDialogImpl::OpenWebDialog() {
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
-  window_ = browser::ShowHtmlDialog(NULL,
-                                    browser->profile()->GetOriginalProfile(),
-                                    NULL,
-                                    this,
-                                    STYLE_GENERIC);
+  window_ = browser::ShowWebDialog(NULL,
+                                   browser->profile()->GetOriginalProfile(),
+                                   NULL,
+                                   this,
+                                   STYLE_GENERIC);
 }
 
 // ****************************************************
 //
 // static
 void TaskManagerDialog::Show() {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&TaskManagerDialogImpl::Show, false));
 }
 
 // static
 void TaskManagerDialog::ShowBackgroundPages() {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&TaskManagerDialogImpl::Show, true));
 }
 
 // static
 bool TaskManagerDialog::UseWebUITaskManager() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kWebUITaskManager);
 }