Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc

 // Copyright 2013 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/passwords/manage_passwords_icon_view.h"
 
+#include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ManagePasswordsIconView::ManagePasswordsIconView(
     LocationBarView::Delegate* location_bar_delegate)
     : location_bar_delegate_(location_bar_delegate) {
   set_accessibility_focusable(true);
   Update(NULL);
   LocationBarView::InitTouchableLocationBarChildView(this);
 }
 
 ManagePasswordsIconView::~ManagePasswordsIconView() {}
 
 void ManagePasswordsIconView::Update(
-    ManagePasswordsIconController* manage_passwords_icon_controller) {
-  SetVisible(
-      manage_passwords_icon_controller &&
-      manage_passwords_icon_controller->manage_passwords_icon_to_be_shown() &&
-      !location_bar_delegate_->GetToolbarModel()->input_in_progress());
+    ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller) {
+  SetVisible(manage_passwords_bubble_ui_controller &&
+      manage_passwords_bubble_ui_controller->manage_passwords_icon_to_be_shown()
+      && !location_bar_delegate_->GetToolbarModel()->input_in_progress());

[Garrett Casto, 2013/12/02 22:28:49]

You should be consistent about how you break lines with "&&"
(http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Boolea...).
Personally I would rename "manage_passwords_bubble_ui_controller" to something
shorter ("bubble_ui_controller" maybe?), but if you don't want to do that, I
would think that you would indent like

manage_passwords_bubble_ui_controller->
    manage_passwords_icon_to_be_show() &&
!location_bar_delegate...

[npentrel, 2013/12/03 10:00:25]

Done.

   if (!visible()) {
     ManagePasswordsBubbleView::CloseBubble();
     return;
   }
   SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_SAVE_PASSWORD));
-  SetTooltip(manage_passwords_icon_controller->password_to_be_saved());
+  SetTooltip(manage_passwords_bubble_ui_controller->password_to_be_saved());
 }
 
 void ManagePasswordsIconView::ShowBubbleIfNeeded(
-    ManagePasswordsIconController* manage_passwords_icon_controller) {
-  if (manage_passwords_icon_controller->
-          manage_passwords_bubble_needs_showing() &&
-      visible() && !ManagePasswordsBubbleView::IsShowing()) {
+    ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller) {
+  if (manage_passwords_bubble_ui_controller->
+          manage_passwords_bubble_needs_showing() && visible() &&
+      !ManagePasswordsBubbleView::IsShowing()) {

[Garrett Casto, 2013/12/02 22:28:49]

Break after "&&" here as well. So 

manage_passwords_bubble_ui_controller->
   manage_passwords_bubble_needs_showing() &&
visible() &&
...

[npentrel, 2013/12/03 10:00:25]

Done.

     ManagePasswordsBubbleView::ShowBubble(
         location_bar_delegate_->GetWebContents(), this);
-    manage_passwords_icon_controller->OnBubbleShown();
+    manage_passwords_bubble_ui_controller->OnBubbleShown();
   }
 }
 
 void ManagePasswordsIconView::SetTooltip(bool password_to_be_saved) {
   SetTooltipText(l10n_util::GetStringUTF16(
       (password_to_be_saved ?
           IDS_PASSWORD_MANAGER_TOOLTIP_SAVE :
           IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE)));
 }
 
@@ skipping 15 matching lines @@
 bool ManagePasswordsIconView::OnMousePressed(const ui::MouseEvent& event) {
   // Do nothing until the mouse button is released.
   return true;
 }
 
 void ManagePasswordsIconView::OnMouseReleased(const ui::MouseEvent& event) {
   if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location()))
     ManagePasswordsBubbleView::ShowBubble(
         location_bar_delegate_->GetWebContents(), this);
 }