Save password bubble pops up automatically

chrome/browser/ui/views/location_bar/content_setting_image_view.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/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 76 matching lines @@
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
   slide_animator_.SetTweenType(ui::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_)
     bubble_widget_->RemoveObserver(this);
 }
 
-void ContentSettingImageView::Update(content::WebContents* web_contents) {
+void ContentSettingImageView::UpdatePostLayout(

[Peter Kasting, 2013/09/03 23:50:43]

Function definition order needs to match declaration order.

[npentrel, 2013/09/04 09:55:36]

Done.

+    content::WebContents* web_contents) {
+  if (!content_setting_image_model_->is_visible()) {

[Peter Kasting, 2013/09/03 23:50:43]

Nit: No {}

[npentrel, 2013/09/04 09:55:36]

Done.

+    return;
+  }
+
+  TabSpecificContentSettings* content_settings = web_contents ?

[Peter Kasting, 2013/09/03 23:50:43]

Nit: This should be done inside the below conditional

[npentrel, 2013/09/04 09:55:36]

Done.

+      TabSpecificContentSettings::FromWebContents(web_contents) : NULL;
+
+  if (content_setting_image_model_->get_content_settings_type() ==
+      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {

[Peter Kasting, 2013/09/03 23:50:43]

It would be nice if this was more generic than "is this a save password icon"...
perhaps some kind of "should auto-show bubble on blockage" method that the save
password model overrides to return true.

Nit: Maybe reverse this and early return (but see comment in next function)

[npentrel, 2013/09/04 09:55:36]

Done.

+    if (!content_settings->IsBlockageIndicated(
+             content_setting_image_model_->get_content_settings_type())) {
+      if (web_contents && !bubble_widget_) {
+        bubble_widget_ = parent_->delegate()->CreateViewsBubble(
+            new ContentSettingBubbleContents(
+                ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+                    parent_->delegate()->GetContentSettingBubbleModelDelegate(),
+                    web_contents, parent_->profile(),
+                    content_setting_image_model_->get_content_settings_type()),
+                web_contents, this, views::BubbleBorder::TOP_RIGHT));
+        bubble_widget_->AddObserver(this);
+        bubble_widget_->Show();
+      }
+      content_settings->SetBlockageHasBeenIndicated(
+          content_setting_image_model_->get_content_settings_type());
+    }
+  }
+}
+
+void ContentSettingImageView::UpdatePreLayout(
+    content::WebContents* web_contents) {
   // Note: We explicitly want to call this even if |web_contents| is NULL, so we
   // get hidden properly while the user is editing the omnibox.
   content_setting_image_model_->UpdateFromWebContents(web_contents);
 
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
     return;
   }
 
   icon_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ skipping 13 matching lines @@
   // We just ignore this blockage if we're already showing some other string to
   // the user.  If this becomes a problem, we could design some sort of queueing
   // mechanism to show one after the other, but it doesn't seem important now.
   int string_id = content_setting_image_model_->explanatory_string_id();
   if (string_id && !background_showing()) {
     text_label_->SetText(l10n_util::GetStringUTF16(string_id));
     text_label_->SetVisible(true);
     slide_animator_.Show();
   }
 
-  content_settings->SetBlockageHasBeenIndicated(
-      content_setting_image_model_->get_content_settings_type());
+  // The blockage for |CONTENT_SETTINGS_TYPE_SAVE_PASSWORD| is set once the
+  // bubble pops up.

[Peter Kasting, 2013/09/03 23:50:43]

Nit: Say why, not what.  This comment currently just restates the code; instead
talk about why this needs to be, i.e. that the bubble needs to be anchored by
the laid-out icon, which isn't positioned correctly until after this returns.

[npentrel, 2013/09/04 09:55:36]

Done.

+  if (content_setting_image_model_->get_content_settings_type() !=
+      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
+    content_settings->SetBlockageHasBeenIndicated(
+        content_setting_image_model_->get_content_settings_type());

[Peter Kasting, 2013/09/03 23:50:43]

I wonder if for consistency's sake, we should move this out of this function
entirely and make the post-layout function more like:

if (should show bubble)
  show bubble;
set blockage has been indicated;

This way, we'd always call the "set indicated" method at the same time in the
call chain.  This might reduce the chance of weird timing bugs later?

[npentrel, 2013/09/04 09:55:36]

Done.

+  }
 }
 
 // static
 int ContentSettingImageView::GetBubbleOuterPadding(bool by_icon) {
   return LocationBarView::GetItemPadding() - LocationBarView::kBubblePadding +
       (by_icon ? 0 : LocationBarView::kIconInternalPadding);
 }
 
 void ContentSettingImageView::AnimationEnded(const ui::Animation* animation) {
   slide_animator_.Reset();
@@ skipping 107 matching lines @@
         parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
             ContentSettingBubbleModel::CreateContentSettingBubbleModel(
                 parent_->delegate()->GetContentSettingBubbleModelDelegate(),
                 web_contents, parent_->profile(),
                 content_setting_image_model_->get_content_settings_type()),
             web_contents, this, views::BubbleBorder::TOP_RIGHT));
     bubble_widget_->AddObserver(this);
     bubble_widget_->Show();
   }
 }