New avatar button: Consolidate text elision between Mac and Win/Linux

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // Copyright 2014 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/profiles/new_avatar_button.h"
 
 #include "base/strings/utf_string_conversions.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "base/win/windows_version.h"

[msw, 2014/07/21 15:26:07]

I think you can remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

[msw, 2014/07/21 15:26:07]

Can you remove this?

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "chrome/browser/ui/browser.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"

[msw, 2014/07/21 15:26:07]

Can you remove this?

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "grit/generated_resources.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"

[msw, 2014/07/21 15:26:07]

I think you can remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "ui/gfx/font_list.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "ui/gfx/text_constants.h"

[msw, 2014/07/21 15:26:07]

I think you can remove this.

[Marc Treib, 2014/07/21 16:43:52]

Done.

 #include "ui/gfx/text_elider.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
                                        const int hot_image_set[],
                                        const int pushed_image_set[]) {
   scoped_ptr<views::LabelButtonBorder> border(
       new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON));
   border->SetPainter(false, views::Button::STATE_NORMAL,
       views::Painter::CreateImageGridPainter(normal_image_set));
   border->SetPainter(false, views::Button::STATE_HOVERED,
       views::Painter::CreateImageGridPainter(hot_image_set));
   border->SetPainter(false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(pushed_image_set));
 
   const int kLeftRightInset = 10;
   const int kTopInset = 0;
   const int kBottomInset = 4;
   border->set_insets(gfx::Insets(kTopInset, kLeftRightInset,
                                  kBottomInset, kLeftRightInset));
 
   return border.PassAs<views::Border>();
 }
 
-base::string16 GetElidedText(const base::string16& original_text) {
-  // Maximum characters the button can be before the text will get elided.
-  const int kMaxCharactersToDisplay = 15;
-  const gfx::FontList font_list;
-  return gfx::ElideText(original_text, font_list,
-                        font_list.GetExpectedTextWidth(kMaxCharactersToDisplay),
-                        gfx::ELIDE_TAIL);
-}
-
-base::string16 GetButtonText(Profile* profile) {
-  base::string16 name = GetElidedText(profiles::GetAvatarNameForProfile(
-      profile->GetPath()));
-  if (profile->IsSupervised())
-    name = l10n_util::GetStringFUTF16(IDS_SUPERVISED_USER_NEW_AVATAR_LABEL,
-                                      name);
-  return name;
-}
-
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
-    : MenuButton(listener, GetButtonText(browser->profile()), NULL, true),
+    : MenuButton(listener,
+                 profiles::GetAvatarButtonTextForProfile(browser->profile()),
+                 NULL,
+                 true),
       browser_(browser) {
   set_animate_on_state_change(false);
   SetTextColor(views::Button::STATE_NORMAL, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_HOVERED, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_PRESSED, SK_ColorWHITE);
   SetTextShadows(gfx::ShadowValues(10,
       gfx::ShadowValue(gfx::Point(), 1.0f, SK_ColorDKGRAY)));
   SetTextSubpixelRenderingEnabled(false);
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
@@ skipping 79 matching lines @@
     icon = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToImageSkia();
   }
 
   SetImage(views::Button::STATE_NORMAL, icon);
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
-  SetText(GetButtonText(browser_->profile()));
+  SetText(profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   set_min_size(gfx::Size());
   InvalidateLayout();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }