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::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 12 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();
   }
+}

[Peter Kasting, 2013/09/05 06:55:19]

Nit: Add comment at end of function:

Since indicating blockage may include showing a bubble, which must be done in
UpdatePostLayout() so the bubble has the the right anchor coordinates, we delay
calling SetBlockageHasBeeenIndicated() until that function completes.

[npentrel, 2013/09/05 08:28:09]

Done.

 
-  content_settings->SetBlockageHasBeenIndicated(
-      content_setting_image_model_->get_content_settings_type());
+void ContentSettingImageView::UpdatePostLayout(
+    content::WebContents* web_contents) {
+  if (!content_setting_image_model_->is_visible())
+    return;
+
+  TabSpecificContentSettings* content_settings = web_contents ?
+     TabSpecificContentSettings::FromWebContents(web_contents) : NULL;
+  if (!content_settings)
+    return;
+  if (!content_settings->IsBlockageIndicated(

[Peter Kasting, 2013/09/05 06:55:19]

Nit: Either put a blank line here, or remove the one above

[npentrel, 2013/09/05 08:28:09]

Done.

+      content_setting_image_model_->get_content_settings_type())) {
+    if (content_setting_image_model_->ShouldShowBubbleOnBlockage()) {

[Peter Kasting, 2013/09/05 06:55:19]

Nit: No {}

[npentrel, 2013/09/05 08:28:09]

Done.

+      CreateBubble(web_contents);
+    }
+    content_settings->SetBlockageHasBeenIndicated(
+        content_setting_image_model_->get_content_settings_type());
+  }
 }
 
 // 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 96 matching lines @@
   if (slide_animator_.is_animating()) {
     if (!pause_animation_) {
       pause_animation_ = true;
       pause_animation_state_ = slide_animator_.GetCurrentValue();
     }
     slide_animator_.Reset();
   }
 
   content::WebContents* web_contents = parent_->GetWebContents();
   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();
+    CreateBubble(web_contents);
   }
 }
+
+void ContentSettingImageView::CreateBubble(content::WebContents* web_contents) {
+  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();
+}