Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/ui/views/passwords/manage_passwords_bubble_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_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/passwords/manage_passwords_icon_controller.h"
+#include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
+

[markusheintz_, 2013/11/26 12:44:37]

Please remove these 3 lines. No need for special ASCII separators. Same below.

+// Helpers --------------------------------------------------------------------
+
 namespace {
 
+// Updates either the biggest possible width for the username field in the
+// manage passwords bubble or the biggest possible width for the password field.
 void UpdateBiggestWidth(const autofill::PasswordForm& password_form,
                         bool username,
                         int* biggest_width) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   gfx::FontList font_list(rb->GetFontList(ui::ResourceBundle::BaseFont));
   string16 display_string(username ?
       password_form.username_value :
       ManagePasswordItemView::GetPasswordDisplayString(
           password_form.password_value));
   *biggest_width = std::max(
       gfx::Canvas::GetStringWidth(display_string, font_list), *biggest_width);
 }
 
 }  // namespace
 
+

[markusheintz_, 2013/11/26 12:44:37]

Please remove these 3 lines. (see comment above)

+// ManagePasswordsBubbleView --------------------------------------------------
+
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            ManagePasswordsIconView* icon_view) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(browser->fullscreen_controller());
   DCHECK(!IsShowing());
 
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   bool is_fullscreen = browser_view->IsFullscreen();
   views::View* anchor_view = is_fullscreen ?
       NULL : browser_view->GetLocationBarView()->manage_passwords_icon_view();
   manage_passwords_bubble_ =
-      new ManagePasswordsBubbleView(anchor_view, web_contents, icon_view);
+      new ManagePasswordsBubbleView(web_contents, anchor_view, icon_view);
 
   if (is_fullscreen) {
     manage_passwords_bubble_->set_parent_window(
         web_contents->GetView()->GetTopLevelNativeWindow());
   }
 
   views::BubbleDelegateView::CreateBubble(manage_passwords_bubble_);
 
   // Adjust for fullscreen after creation as it relies on the content size.
   if (is_fullscreen) {
@@ skipping 11 matching lines @@
 }
 
 // static
 bool ManagePasswordsBubbleView::IsShowing() {
   // The bubble may be in the process of closing.
   return (manage_passwords_bubble_ != NULL) &&
       manage_passwords_bubble_->GetWidget()->IsVisible();
 }
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
+    content::WebContents* web_contents,
     views::View* anchor_view,
-    content::WebContents* web_contents,
     ManagePasswordsIconView* icon_view)
     : BubbleDelegateView(
           anchor_view,
           anchor_view ?
               views::BubbleBorder::TOP_RIGHT : views::BubbleBorder::NONE),
       manage_passwords_bubble_model_(
           new ManagePasswordsBubbleModel(web_contents)),
       icon_view_(icon_view) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
@@ skipping 40 matching lines @@
   GetWidget()->Close();
 }
 
 void ManagePasswordsBubbleView::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
   // This calculates the necessary widths for the list of credentials in the
-  // bubble.
+  // bubble; we do not need to clamp the password field width because

[markusheintz_, 2013/11/26 12:44:37]

nit: s/; we/. We/

[npentrel, 2013/11/26 14:25:55]

Done.

+  // ManagePasswordItemView::GetPasswordFisplayString() does this.
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  const int kPredefinedFieldMaxWidth =
+  const int predefined_username_field_max_width =

[markusheintz_, 2013/11/26 12:44:37]

bad name format: Please follow the Google C++ style guide for naming consts
since the Chromium style guide does not deviate here:
https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...

[npentrel, 2013/11/26 14:25:55]

Not a compile time const.

       rb->GetFont(ui::ResourceBundle::BaseFont).GetAverageCharacterWidth() * 22;
-  const int kMaxUsernameFieldWidth = std::min(
-      GetMaximumUsernameOrPasswordWidth(true), kPredefinedFieldMaxWidth);
-  const int kFirstFieldWidth = std::max(kMaxUsernameFieldWidth,
+  const int max_username_or_password_width =

[markusheintz_, 2013/11/26 12:44:37]

bad name format: Please follow the Google C++ style guide for naming consts
since the Chromium style guide does not deviate here:
https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...

[npentrel, 2013/11/26 14:25:55]

Not a compile time const.

+      std::min(GetMaximumUsernameOrPasswordWidth(true),
+               predefined_username_field_max_width);
+  const int first_field_width = std::max(max_username_or_password_width,

[markusheintz_, 2013/11/26 12:44:37]

bad name format: Please follow the Google C++ style guide for naming consts
since the Chromium style guide does not deviate here:
https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...

[npentrel, 2013/11/26 14:25:55]

Not a compile time const.

       views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED)).
           GetPreferredSize().width());
 
-  const int kMaxPasswordFieldWidth = GetMaximumUsernameOrPasswordWidth(false);
-  const int kSecondFieldWidth = std::max(kMaxPasswordFieldWidth,
+  const int second_field_width = std::max(

[markusheintz_, 2013/11/26 12:44:37]

bad name format: Please follow the Google C++ style guide for naming consts
since the Chromium style guide does not deviate here:
https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...

[npentrel, 2013/11/26 14:25:55]

Not a compile time const.

+      GetMaximumUsernameOrPasswordWidth(false),
       views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO)).
           GetPreferredSize().width());
 
   const int kSingleColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSingleColumnSetId);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
 
@@ skipping 13 matching lines @@
     views::ColumnSet* single_column =
         layout->AddColumnSet(kSingleColumnCredentialsId);
     single_column->AddPaddingColumn(0, views::kPanelHorizMargin);
     single_column->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                              GridLayout::USE_PREF, 0, 0);
     single_column->AddPaddingColumn(0, views::kPanelHorizMargin);
 
     layout->StartRow(0, kSingleColumnCredentialsId);
     ManagePasswordItemView* item = new ManagePasswordItemView(
         manage_passwords_bubble_model_,
-        manage_passwords_bubble_model_->pending_credentials(), kFirstFieldWidth,
-        kSecondFieldWidth);
+        manage_passwords_bubble_model_->pending_credentials(),
+        first_field_width, second_field_width);
     item->set_border(views::Border::CreateSolidSidedBorder(
         1, 0, 1, 0, GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor)));
     layout->AddView(item);
 
     const int kDoubleColumnSetId = 2;
     views::ColumnSet* double_column_set =
         layout->AddColumnSet(kDoubleColumnSetId);
     double_column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
     double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 1,
@@ skipping 34 matching lines @@
     single_column->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                              GridLayout::USE_PREF, 0, 0);
     single_column->AddPaddingColumn(0, views::kPanelHorizMargin);
 
     if (!manage_passwords_bubble_model_->best_matches().empty()) {
       for (autofill::PasswordFormMap::const_iterator i(
                manage_passwords_bubble_model_->best_matches().begin());
            i != manage_passwords_bubble_model_->best_matches().end(); ++i) {
         layout->StartRow(0, kSingleColumnCredentialsId);
         ManagePasswordItemView* item = new ManagePasswordItemView(
-            manage_passwords_bubble_model_, *i->second, kFirstFieldWidth,
-            kSecondFieldWidth);
+            manage_passwords_bubble_model_, *i->second, first_field_width,
+            second_field_width);
         if (i == manage_passwords_bubble_model_->best_matches().begin()) {
           item->set_border(views::Border::CreateSolidSidedBorder(
               1, 0, 1, 0, GetNativeTheme()->GetSystemColor(
                   ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor)));
         } else {
           item->set_border(views::Border::CreateSolidSidedBorder(
               0, 0, 1, 0, GetNativeTheme()->GetSystemColor(
                   ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor)));
         }
         layout->AddView(item);
       }
     } else if (!manage_passwords_bubble_model_->password_submitted()) {
         views::Label* empty_label = new views::Label(
             l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_NO_PASSWORDS));
         empty_label->SetMultiLine(true);
         layout->StartRow(0, kSingleColumnSetId);
         layout->AddView(empty_label);
     }
 
     if (manage_passwords_bubble_model_->password_submitted()) {
       layout->StartRow(0, kSingleColumnCredentialsId);
       ManagePasswordItemView* item = new ManagePasswordItemView(
           manage_passwords_bubble_model_,
           manage_passwords_bubble_model_->pending_credentials(),
-          kFirstFieldWidth, kSecondFieldWidth);
+          first_field_width, second_field_width);
       if (manage_passwords_bubble_model_->best_matches().empty()) {
         item->set_border(views::Border::CreateSolidSidedBorder(1, 0, 1, 0,
             GetNativeTheme()->GetSystemColor(
                 ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor)));
       } else {
         item->set_border(views::Border::CreateSolidSidedBorder(0, 0, 1, 0,
             GetNativeTheme()->GetSystemColor(
                 ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor)));
       }
       layout->AddView(item);
@@ skipping 32 matching lines @@
       manage_passwords_bubble_model_->manage_passwords_bubble_state() ==
           ManagePasswordsBubbleModel::PASSWORD_TO_BE_SAVED);
   Close();
 }
 
 void ManagePasswordsBubbleView::LinkClicked(views::Link* source,
                                             int event_flags) {
   DCHECK_EQ(source, manage_link_);
   manage_passwords_bubble_model_->OnManageLinkClicked();
 }