Refactored out JS specific part of modal dialog stack into its own class, exp...

chrome/browser/views/cookie_prompt_view.cc

 // Copyright (c) 2010 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/views/cookie_prompt_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "chrome/browser/cookie_modal_dialog.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/cookie_info_view.h"
 #include "chrome/browser/views/local_storage_info_view.h"
 #include "chrome/browser/views/options/content_settings_window_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cookie_monster.h"
 #include "views/controls/label.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/window/non_client_view.h"
 
 static const int kCookiePromptViewInsetSize = 5;
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, public:
+// CookiePromptView, public:
 
-// static
-void CookiesPromptView::ShowCookiePromptWindow(
-    gfx::NativeWindow parent,
-    Profile* profile,
-    const std::string& domain,
-    const net::CookieMonster::CanonicalCookie& cookie,
-    CookiesPromptViewDelegate* delegate) {
-  CookiesPromptView* cookies_view = new CookiesPromptView(profile, delegate);
-  cookies_view->SetCookie(domain, cookie);
-  views::Window::CreateChromeWindow(parent,
-                                    gfx::Rect(),
-                                    cookies_view)->Show();
+CookiePromptView::CookiePromptView(
+      CookiePromptModalDialog* parent,
+      gfx::NativeWindow root_window,
+      Profile* profile,
+      const GURL& url,
+      const std::string& cookie_line,
+      CookiePromptModalDialogDelegate* delegate)
+      : parent_(parent),
+        root_window_(root_window),
+        profile_(profile),
+        delegate_(delegate) {
+  cookie_ui_ = true;
+  net::CookieMonster::ParsedCookie cookie(cookie_line);
+  InitializeViewResources(cookie.HasDomain() ? cookie.Domain() : url.host());
 }
 
-// static
-void CookiesPromptView::ShowLocalStoragePromptWindow(
-    gfx::NativeWindow parent,
-    Profile* profile,
-    const std::string& domain,
-    const BrowsingDataLocalStorageHelper::LocalStorageInfo& local_storage_info,
-    CookiesPromptViewDelegate* delegate) {
-  CookiesPromptView* cookies_view = new CookiesPromptView(profile, delegate);
-  cookies_view->SetLocalStorage(domain, local_storage_info);
-  views::Window::CreateChromeWindow(parent,
-                                    gfx::Rect(),
-                                    cookies_view)->Show();
+CookiePromptView::CookiePromptView(
+      CookiePromptModalDialog* parent,
+      gfx::NativeWindow root_window,
+      Profile* profile,
+      const BrowsingDataLocalStorageHelper::LocalStorageInfo& storage_info,
+      CookiePromptModalDialogDelegate* delegate)
+      : parent_(parent),
+        root_window_(root_window),
+        profile_(profile),
+        local_storage_info_(storage_info),
+        delegate_(delegate) {
+  cookie_ui_ = false;
+  InitializeViewResources(storage_info.host);
 }
 
-
-CookiesPromptView::~CookiesPromptView() {
-}
-
-void CookiesPromptView::SetCookie(
-    const std::string& domain,
-    const net::CookieMonster::CanonicalCookie& cookie) {
-  cookie_ui_ = true;
-  InitializeViewResources(domain);
-  cookie_ = cookie;
-}
-
-void CookiesPromptView::SetLocalStorage(
-    const std::string& domain,
-    const BrowsingDataLocalStorageHelper::LocalStorageInfo storage_info) {
-  cookie_ui_ = false;
-  InitializeViewResources(domain);
-  local_storage_info_ = storage_info;
+CookiePromptView::~CookiePromptView() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, views::View overrides:
+// CookiePromptView, views::View overrides:
 
-gfx::Size CookiesPromptView::GetPreferredSize() {
+gfx::Size CookiePromptView::GetPreferredSize() {
   gfx::Size client_size = views::View::GetPreferredSize();
   return gfx::Size(client_size.width(),
                    client_size.height() + GetExtendedViewHeight());
 }
 
 
-void CookiesPromptView::ViewHierarchyChanged(bool is_add,
-                                             views::View* parent,
-                                             views::View* child) {
+void CookiePromptView::ViewHierarchyChanged(bool is_add,
+                                            views::View* parent,
+                                            views::View* child) {
   if (is_add && child == this)
     Init();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, views::DialogDelegate implementation:
+// CookiePromptView, ModalDialogDelegate implementation:
 
-std::wstring CookiesPromptView::GetWindowTitle() const {
+gfx::NativeWindow CookiePromptView::GetDialogRootWindow() {
+  return root_window_;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CookiePromptView, views::DialogDelegate implementation:
+
+std::wstring CookiePromptView::GetWindowTitle() const {
   return title_;
 }
 
-void CookiesPromptView::WindowClosing() {
+void CookiePromptView::WindowClosing() {
   if (!signaled_ && delegate_)
     delegate_->BlockSiteData(false);
+  parent_->CompleteDialog();
 }
 
-views::View* CookiesPromptView::GetContentsView() {
+views::View* CookiePromptView::GetContentsView() {
   return this;
 }
 
 // CookieInfoViewDelegate overrides:
-void CookiesPromptView::ModifyExpireDate(bool session_expire) {
+void CookiePromptView::ModifyExpireDate(bool session_expire) {
   session_expire_ = session_expire;
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, views::ButtonListener implementation:
+// CookiePromptView, views::ButtonListener implementation:
 
-void CookiesPromptView::ButtonPressed(views::Button* sender,
-                                      const views::Event& event) {
+void CookiePromptView::ButtonPressed(views::Button* sender,
+                                     const views::Event& event) {
   if (sender == allow_button_) {
     if (delegate_) {
       delegate_->AllowSiteData(remember_radio_->checked(), session_expire_);
       signaled_ = true;
     }
     GetWindow()->Close();
   } else if (sender == block_button_) {
     if (delegate_) {
       delegate_->BlockSiteData(remember_radio_->checked());
       signaled_ = true;
     }
     GetWindow()->Close();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, views::LinkController implementation:
-void CookiesPromptView::LinkActivated(views::Link* source, int event_flags) {
+// CookiePromptView, views::LinkController implementation:
+void CookiePromptView::LinkActivated(views::Link* source, int event_flags) {
   if (source == show_cookie_link_)
     ToggleDetailsViewExpand();
   else if (source == manage_cookies_link_)
     ContentSettingsWindowView::Show(CONTENT_SETTINGS_TYPE_COOKIES, profile_);
   else
     NOTREACHED();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesPromptView, private:
+// CookiePromptView, private:
 
-CookiesPromptView::CookiesPromptView(Profile* profile,
-                                     CookiesPromptViewDelegate* delegate)
+CookiePromptView::CookiePromptView(Profile* profile,
+                                   CookiePromptModalDialogDelegate* delegate)
     : remember_radio_(NULL),
       ask_radio_(NULL),
       allow_button_(NULL),
       block_button_(NULL),
       show_cookie_link_(NULL),
       manage_cookies_link_(NULL),
       info_view_(NULL),
       session_expire_(false),
       expanded_view_(false),
       signaled_(false),
       delegate_(delegate),
       profile_(profile) {
 }
 
-void CookiesPromptView::Init() {
+void CookiePromptView::Init() {
   views::Label* description_label = new views::Label(l10n_util::GetStringF(
       cookie_ui_ ? IDS_COOKIE_ALERT_LABEL : IDS_DATA_ALERT_LABEL,
       display_domain_));
   int radio_group_id = 0;
   remember_radio_ = new views::RadioButton(
       l10n_util::GetStringF(IDS_COOKIE_ALERT_REMEMBER_RADIO, display_domain_),
       radio_group_id);
   remember_radio_->set_listener(this);
   ask_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_COOKIE_ALERT_ASK_RADIO), radio_group_id);
@@ skipping 77 matching lines @@
                   GridLayout::TRAILING, GridLayout::CENTER);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, one_column_layout_id);
 
   if (cookie_ui_) {
     CookieInfoView* cookie_info_view = new CookieInfoView(true);
     cookie_info_view->set_delegate(this);
     layout->AddView(cookie_info_view, 1, 1, GridLayout::FILL,
                     GridLayout::CENTER);
-    cookie_info_view->SetCookie(domain_, cookie_);
+
+    cookie_info_view->SetCookieString(domain_, cookie_line_);
     info_view_ = cookie_info_view;
   } else {
     LocalStorageInfoView* local_storage_info_view = new LocalStorageInfoView();
     layout->AddView(local_storage_info_view, 1, 1, GridLayout::FILL,
                     GridLayout::CENTER);
     local_storage_info_view->SetLocalStorageInfo(local_storage_info_);
     info_view_ = local_storage_info_view;
   }
   info_view_->SetVisible(false);
 
   // Set default values.
   ask_radio_->SetChecked(true);
 }
 
-int CookiesPromptView::GetExtendedViewHeight() {
+int CookiePromptView::GetExtendedViewHeight() {
   DCHECK(info_view_);
   return expanded_view_ ?
       kRelatedControlVerticalSpacing : -info_view_->GetPreferredSize().height();
 }
 
-void CookiesPromptView::ToggleDetailsViewExpand() {
+void CookiePromptView::ToggleDetailsViewExpand() {
   expanded_view_ = !expanded_view_;
   views::Window* parent = GetWindow();
   gfx::Size non_client_size = parent->GetNonClientView()->GetPreferredSize();
   gfx::Rect bounds = parent->GetBounds();
   bounds.set_height(non_client_size.height() + GetExtendedViewHeight());
   parent->SetBounds(bounds, NULL);
 
   info_view_->SetVisible(expanded_view_);
   Layout();
 }
 
-void CookiesPromptView::InitializeViewResources(const std::string& domain) {
+void CookiePromptView::InitializeViewResources(const std::string& domain) {
   domain_ = domain;
   std::string display_domain = domain;
   if (!domain.empty() && domain[0] == '.')
-  display_domain = display_domain.substr(1);
+    display_domain = display_domain.substr(1);
   display_domain_ = UTF8ToWide(display_domain);
   title_ = l10n_util::GetStringF(
       cookie_ui_ ? IDS_COOKIE_ALERT_TITLE : IDS_DATA_ALERT_TITLE,
       display_domain_);
 }