chromeos: Rename LoginHtmlDialog to LoginWebDialog.

This is a follow up to r133991.

R=stevenjb@chromium.org,avayvod@chromium.org

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

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

chrome/browser/chromeos/login/help_app_launcher.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -55,13 +55,13 @@ void HelpAppLauncher::ShowHelpTopic(HelpTopic help_topic_id) {
 
 void HelpAppLauncher::ShowHelpTopicDialog(const GURL& topic_url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  dialog_.reset(new LoginHtmlDialog(
+  dialog_.reset(new LoginWebDialog(
       this,
       parent_window_,
       UTF16ToWide(
           l10n_util::GetStringUTF16(IDS_LOGIN_OOBE_HELP_DIALOG_TITLE)),
       topic_url,
-      LoginHtmlDialog::STYLE_BUBBLE));
+      LoginWebDialog::STYLE_BUBBLE));
   dialog_->Show();
 }
 

chrome/browser/chromeos/login/help_app_launcher.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/login/login_html_dialog.h"
+#include "chrome/browser/chromeos/login/login_web_dialog.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace chromeos {
@@ -17,7 +17,7 @@ namespace chromeos {
 // Provides help content during OOBE / login.
 // Based on connectivity state (offline/online) shows help topic dialog
 // or launches HelpApp in BWSI mode.
-class HelpAppLauncher : public LoginHtmlDialog::Delegate,
+class HelpAppLauncher : public LoginWebDialog::Delegate,
                         public base::RefCountedThreadSafe<HelpAppLauncher> {
  public:
   // IDs of help topics available from HelpApp.
@@ -47,7 +47,7 @@ class HelpAppLauncher : public LoginHtmlDialog::Delegate,
   bool is_open() const { return dialog_.get() && dialog_->is_open(); }
 
  protected:
-  // LoginHtmlDialog::Delegate implementation:
+  // LoginWebDialog::Delegate implementation:
   virtual void OnDialogClosed() OVERRIDE {}
 
  private:
@@ -55,7 +55,7 @@ class HelpAppLauncher : public LoginHtmlDialog::Delegate,
   void ShowHelpTopicDialog(const GURL& topic_url);
 
   // Dialog used to display help like "Can't access your account".
-  scoped_ptr<LoginHtmlDialog> dialog_;
+  scoped_ptr<LoginWebDialog> dialog_;
 
   // Parent window which is passed to help dialog.
   gfx::NativeWindow parent_window_;

chrome/browser/chromeos/login/login_html_dialog.cc → chrome/browser/chromeos/login/login_web_dialog.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/login/login_html_dialog.h"
+#include "chrome/browser/chromeos/login/login_web_dialog.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -29,16 +29,16 @@ const double kDefaultHeightRatio = 0.6;
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
-// LoginHtmlDialog, public:
+// LoginWebDialog, public:
 
-void LoginHtmlDialog::Delegate::OnDialogClosed() {
+void LoginWebDialog::Delegate::OnDialogClosed() {
 }
 
-LoginHtmlDialog::LoginHtmlDialog(Delegate* delegate,
-                                 gfx::NativeWindow parent_window,
-                                 const std::wstring& title,
-                                 const GURL& url,
-                                 Style style)
+LoginWebDialog::LoginWebDialog(Delegate* delegate,
+                               gfx::NativeWindow parent_window,
+                               const std::wstring& title,
+                               const GURL& url,
+                               Style style)
     : delegate_(delegate),
       parent_window_(parent_window),
       title_(WideToUTF16Hack(title)),
@@ -51,80 +51,80 @@ LoginHtmlDialog::LoginHtmlDialog(Delegate* delegate,
   height_ = static_cast<int>(kDefaultHeightRatio * screen_bounds.height());
 }
 
-LoginHtmlDialog::~LoginHtmlDialog() {
+LoginWebDialog::~LoginWebDialog() {
   delegate_ = NULL;
 }
 
-void LoginHtmlDialog::Show() {
+void LoginWebDialog::Show() {
   views::Widget::CreateWindowWithParent(
       new WebDialogView(ProfileManager::GetDefaultProfile(), NULL, this),
       parent_window_)->Show();
   is_open_ = true;
 }
 
-void LoginHtmlDialog::SetDialogSize(int width, int height) {
+void LoginWebDialog::SetDialogSize(int width, int height) {
   DCHECK(width >= 0 && height >= 0);
   width_ = width;
   height_ = height;
 }
 
-void LoginHtmlDialog::SetDialogTitle(const string16& title) {
+void LoginWebDialog::SetDialogTitle(const string16& title) {
   title_ = title;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// LoginHtmlDialog, protected:
+// LoginWebDialog, protected:
 
-ui::ModalType LoginHtmlDialog::GetDialogModalType() const {
+ui::ModalType LoginWebDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
-string16 LoginHtmlDialog::GetDialogTitle() const {
+string16 LoginWebDialog::GetDialogTitle() const {
   return title_;
 }
 
-GURL LoginHtmlDialog::GetDialogContentURL() const {
+GURL LoginWebDialog::GetDialogContentURL() const {
   return url_;
 }
 
-void LoginHtmlDialog::GetWebUIMessageHandlers(
+void LoginWebDialog::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
 }
 
-void LoginHtmlDialog::GetDialogSize(gfx::Size* size) const {
+void LoginWebDialog::GetDialogSize(gfx::Size* size) const {
   size->SetSize(width_, height_);
 }
 
-std::string LoginHtmlDialog::GetDialogArgs() const {
+std::string LoginWebDialog::GetDialogArgs() const {
   return std::string();
 }
 
-void LoginHtmlDialog::OnDialogClosed(const std::string& json_retval) {
+void LoginWebDialog::OnDialogClosed(const std::string& json_retval) {
   is_open_ = false;
   notification_registrar_.RemoveAll();
   if (delegate_)
     delegate_->OnDialogClosed();
 }
 
-void LoginHtmlDialog::OnCloseContents(WebContents* source,
-                                      bool* out_close_dialog) {
+void LoginWebDialog::OnCloseContents(WebContents* source,
+                                     bool* out_close_dialog) {
   if (out_close_dialog)
     *out_close_dialog = true;
 }
 
-bool LoginHtmlDialog::ShouldShowDialogTitle() const {
+bool LoginWebDialog::ShouldShowDialogTitle() const {
   return true;
 }
 
-bool LoginHtmlDialog::HandleContextMenu(
+bool LoginWebDialog::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }
 
-void LoginHtmlDialog::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
+void LoginWebDialog::Observe(int type,
+                             const content::NotificationSource& source,
+                             const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
   // TODO(saintlou): Do we need a throbber for Aura?
   NOTIMPLEMENTED();

chrome/browser/chromeos/login/login_html_dialog.h → chrome/browser/chromeos/login/login_web_dialog.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_HTML_DIALOG_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_HTML_DIALOG_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_WEB_DIALOG_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_WEB_DIALOG_H_
 #pragma once
 
 #include <string>
@@ -20,16 +20,17 @@ namespace chromeos {
 class BubbleFrameView;
 
 // Launches web dialog during OOBE/Login with specified URL and title.
-class LoginHtmlDialog : public WebDialogDelegate,
-                        public content::NotificationObserver {
+class LoginWebDialog : public WebDialogDelegate,
+                       public content::NotificationObserver {
  public:
   // Delegate class to get notifications from the dialog.
   class Delegate {
-  public:
-    virtual ~Delegate() {}
-
+   public:
     // Called when dialog has been closed.
     virtual void OnDialogClosed();
+
+   protected:
+    virtual ~Delegate() {}
   };
 
   enum Style {
@@ -37,14 +38,13 @@ class LoginHtmlDialog : public WebDialogDelegate,
     STYLE_BUBBLE   // Use chromeos::BubbleWindow as a host.
   };
 
-  LoginHtmlDialog(Delegate* delegate,
-                  gfx::NativeWindow parent_window,
-                  const std::wstring& title,
-                  const GURL& url,
-                  Style style);
-  virtual ~LoginHtmlDialog();
+  LoginWebDialog(Delegate* delegate,
+                 gfx::NativeWindow parent_window,
+                 const std::wstring& title,
+                 const GURL& url,
+                 Style style);
+  virtual ~LoginWebDialog();
 
-  // Shows created dialog.
   void Show();
 
   // Overrides default width/height for dialog.
@@ -94,9 +94,9 @@ class LoginHtmlDialog : public WebDialogDelegate,
   int width_;
   int height_;
 
-  DISALLOW_COPY_AND_ASSIGN(LoginHtmlDialog);
+  DISALLOW_COPY_AND_ASSIGN(LoginWebDialog);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_HTML_DIALOG_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_WEB_DIALOG_H_

chrome/browser/chromeos/login/proxy_settings_dialog.cc

@@ -39,14 +39,14 @@ namespace chromeos {
 // static
 int ProxySettingsDialog::instance_count_ = 0;
 
-ProxySettingsDialog::ProxySettingsDialog(LoginHtmlDialog::Delegate* delegate,
+ProxySettingsDialog::ProxySettingsDialog(LoginWebDialog::Delegate* delegate,
                                          gfx::NativeWindow window)
-    : LoginHtmlDialog(
+    : LoginWebDialog(
           delegate,
           window,
           std::wstring(),
           GURL(chrome::kChromeUIProxySettingsURL),
-          LoginHtmlDialog::STYLE_BUBBLE) {
+          LoginWebDialog::STYLE_BUBBLE) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   ++instance_count_;
 
@@ -74,7 +74,7 @@ ProxySettingsDialog::~ProxySettingsDialog() {
 }
 
 void ProxySettingsDialog::OnDialogClosed(const std::string& json_retval) {
-  LoginHtmlDialog::OnDialogClosed(json_retval);
+  LoginWebDialog::OnDialogClosed(json_retval);
   content::NotificationService::current()->Notify(
     chrome::NOTIFICATION_LOGIN_PROXY_CHANGED,
     content::NotificationService::AllSources(),

chrome/browser/chromeos/login/proxy_settings_dialog.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,18 +6,18 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_PROXY_SETTINGS_DIALOG_H_
 #pragma once
 
-#include "chrome/browser/chromeos/login/login_html_dialog.h"
+#include "chrome/browser/chromeos/login/login_web_dialog.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace chromeos {
 
 // Should be used on the UI thread only, because of static |instance_count_|.
-class ProxySettingsDialog : public LoginHtmlDialog {
+class ProxySettingsDialog : public LoginWebDialog {
  public:
   // Returns whether the dialog is being shown.
   static bool IsShown();
 
-  ProxySettingsDialog(LoginHtmlDialog::Delegate* delegate,
+  ProxySettingsDialog(LoginWebDialog::Delegate* delegate,
                       gfx::NativeWindow window);
   virtual ~ProxySettingsDialog();
 

chrome/browser/chromeos/login/webui_login_view.h

@@ -9,7 +9,6 @@
 #include <map>
 #include <string>
 
-#include "chrome/browser/chromeos/login/login_html_dialog.h"
 #include "chrome/browser/tab_render_watcher.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "content/public/browser/notification_observer.h"

chrome/chrome_browser.gypi

@@ -660,8 +660,8 @@
         'browser/chromeos/login/login_display.cc',
         'browser/chromeos/login/login_display.h',
         'browser/chromeos/login/login_display_host.h',
-        'browser/chromeos/login/login_html_dialog.cc',
-        'browser/chromeos/login/login_html_dialog.h',
+        'browser/chromeos/login/login_web_dialog.cc',
+        'browser/chromeos/login/login_web_dialog.h',
         'browser/chromeos/login/login_performer.cc',
         'browser/chromeos/login/login_performer.h',
         'browser/chromeos/login/login_status_consumer.cc',