Avoid showing the user a garbage path attribute when the cookie doesn't have ...

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"
@@ skipping 24 matching lines @@
 static const int kCookiePromptViewInsetSize = 5;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiePromptView, public:
 
 CookiePromptView::CookiePromptView(
     CookiePromptModalDialog* parent,
     gfx::NativeWindow root_window,
     Profile* profile,
     const BrowsingDataLocalStorageHelper::LocalStorageInfo& storage_info,
-    const std::string& host,
+    const GURL& url,
     const std::string& cookie_line,
     CookiePromptModalDialogDelegate* delegate,
     bool cookie_ui)
     : remember_radio_(NULL),
       ask_radio_(NULL),
       allow_button_(NULL),
       block_button_(NULL),
       show_cookie_link_(NULL),
       info_view_(NULL),
       session_expire_(false),
       expanded_view_(false),
       signaled_(false),
       cookie_ui_(cookie_ui),
       parent_(parent),
       root_window_(root_window),
-      host_(host),
+      url_(url),
       cookie_line_(cookie_line),
       local_storage_info_(storage_info),
       delegate_(delegate) {
-  InitializeViewResources(host);
+  InitializeViewResources();
   expanded_view_ = g_browser_process->local_state()->
       GetBoolean(prefs::kCookiePromptExpanded);
 }
 
 CookiePromptView::~CookiePromptView() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiePromptView, views::View overrides:
 
@@ skipping 159 matching lines @@
   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->SetCookieString(host_, cookie_line_);
+    cookie_info_view->SetCookieString(url_, 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(expanded_view_);
@@ skipping 19 matching lines @@
   // again as there is a bug in combobox that results in preferred height
   // changing when visible and not visible.
   info_view_->SetVisible(expanded_view_);
   int extended_height_delta = GetExtendedViewHeight() - old_extended_height;
   views::Window* window = GetWindow();
   gfx::Rect bounds = window->GetBounds();
   bounds.set_height(bounds.height() + extended_height_delta);
   window->SetBounds(bounds, NULL);
 }
 
-void CookiePromptView::InitializeViewResources(const std::string& host) {
-  DCHECK(host.empty() || host[0] != '.');
-  host_ = host;
+void CookiePromptView::InitializeViewResources() {
+  host_ = cookie_ui_ ? url_.host() : local_storage_info_.host;
   title_ = l10n_util::GetStringF(
       cookie_ui_ ? IDS_COOKIE_ALERT_TITLE : IDS_DATA_ALERT_TITLE,
       UTF8ToWide(host_));
 }