Adds a settings link to account removal UI

Adds a settings link to account removal UI

See mock at slide 19 https://docs.google.com/a/google.com/presentation/d/1UMAexroivw01osOXpnEqbQcE3FMyDkc9eZoIszm4DP4/edit#slide=id.g12716c62f_012

BUG=345075
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=262804

[guohui, 2014-04-08 14:07:49]

sky for owner review of
chrome/browser/ui/views/...

alexei for owner review of
chrome/browser/ui/cocoa/browser/...

rogerta for all

[sky, 2014-04-08 16:00:51]

LGTM

[Roger Tawa OOO till Jul 10th, 2014-04-08 20:24:00]

lgtm

https://codereview.chromium.org/225963004/diff/80001/chrome/app/generated_res...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/225963004/diff/80001/chrome/app/generated_res...
chrome/app/generated_resources.grd:11618: +      <message
name="IDS_PROFILES_SETTINGS_LINK" desc="The link to the Chrome settings pageon
the account removal view.">
This is the "link text" and not the link.

pageon --> page on

[Alexei Svitkine (slow), 2014-04-08 20:37:51]

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
File chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm (right):

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:145: // Builds a
fixed-width NSTextView.
Document params please.

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:146: NSTextView*
BuildTextView(id<NSTextViewDelegate> delegate,
This seems to be a much more specific method than the name implies. Can the name
be made more specific?

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:163: // Removes
the underlyining from the link.
Nit: underline

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:1338:
contentFrameOrigin, availableWidth);
Nit: Align.

[guohui, 2014-04-09 13:22:53]

https://codereview.chromium.org/225963004/diff/80001/chrome/app/generated_res...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/225963004/diff/80001/chrome/app/generated_res...
chrome/app/generated_resources.grd:11618: +      <message
name="IDS_PROFILES_SETTINGS_LINK" desc="The link to the Chrome settings pageon
the account removal view.">
On 2014/04/08 20:24:00, Roger Tawa wrote:
> This is the "link text" and not the link.
> 
> pageon --> page on
> 

Done.

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
File chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm (right):

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:145: // Builds a
fixed-width NSTextView.
On 2014/04/08 20:37:51, Alexei Svitkine wrote:
> Document params please.

Done.

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:146: NSTextView*
BuildTextView(id<NSTextViewDelegate> delegate,
On 2014/04/08 20:37:51, Alexei Svitkine wrote:
> This seems to be a much more specific method than the name implies. Can the
name
> be made more specific?

Done.

https://codereview.chromium.org/225963004/diff/80001/chrome/browser/ui/cocoa/...
chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm:163: // Removes
the underlyining from the link.
On 2014/04/08 20:37:51, Alexei Svitkine wrote:
> Nit: underline

Done.

[Alexei Svitkine (slow), 2014-04-09 15:09:29]

LGTM

[guohui, 2014-04-09 17:12:25]

The CQ bit was checked by guohui@chromium.org

[commit-bot: I haz the power, 2014-04-09 17:12:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/guohui@chromium.org/225963004/100001

[commit-bot: I haz the power, 2014-04-09 17:12:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-09 17:12:40]

Failed to apply patch for chrome/browser/ui/views/profile_chooser_view.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: chrome/browser/ui/views/profile_chooser_view.cc
  |diff --git a/chrome/browser/ui/views/profile_chooser_view.cc
b/chrome/browser/ui/views/profile_chooser_view.cc
  |index
640b3d6bb6dbef8c21378fc65b123db632bf2142..c46edc63e35bc171db4a85ab5e95ea39daf7b2bc
100644
  |--- a/chrome/browser/ui/views/profile_chooser_view.cc
  |+++ b/chrome/browser/ui/views/profile_chooser_view.cc
  --------------------------
  No file to patch.  Skipping patch.
  4 out of 4 hunks ignored

Patch:       chrome/browser/ui/views/profile_chooser_view.cc
Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc
b/chrome/browser/ui/views/profile_chooser_view.cc
index
640b3d6bb6dbef8c21378fc65b123db632bf2142..c46edc63e35bc171db4a85ab5e95ea39daf7b2bc
100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/views/user_manager_view.h"
 #include "chrome/common/pref_names.h"
@@ -43,6 +44,7 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
+#include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/grid_layout.h"
@@ -642,6 +644,11 @@ void ProfileChooserView::LinkClicked(views::Link* sender,
int event_flags) {
   }
 }
 
+void ProfileChooserView::StyledLabelLinkClicked(
+    const gfx::Range& range, int event_flags) {
+  chrome::ShowSettings(browser_);
+}
+
 bool ProfileChooserView::HandleKeyEvent(views::Textfield* sender,
                                         const ui::KeyEvent& key_event) {
   views::Textfield* name_textfield =
@@ -1083,19 +1090,33 @@ views::View*
ProfileChooserView::CreateAccountRemovalView() {
   bool is_primary_account = primary_account == account_id_to_remove_;
 
   // Adds main text.
-  views::Label* content_label = new views::Label(is_primary_account ?
-      l10n_util::GetStringFUTF16(IDS_PROFILES_PRIMARY_ACCOUNT_REMOVAL_TEXT,
-                                 base::UTF8ToUTF16(account_id_to_remove_)) :
-      l10n_util::GetStringUTF16(IDS_PROFILES_ACCOUNT_REMOVAL_TEXT));
-
-  content_label->SetMultiLine(true);
-  content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  layout->StartRowWithPadding(1, 0, 0,
views::kUnrelatedControlVerticalSpacing);
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   const gfx::FontList& small_font_list =
       rb->GetFontList(ui::ResourceBundle::SmallFont);
-  content_label->SetFontList(small_font_list);
-  layout->StartRowWithPadding(1, 0, 0,
views::kUnrelatedControlVerticalSpacing);
-  layout->AddView(content_label);
+
+  if (is_primary_account) {
+    std::vector<size_t> offsets;
+    const base::string16 settings_text =
+        l10n_util::GetStringUTF16(IDS_PROFILES_SETTINGS_LINK);
+    const base::string16 primmary_account_removal_text =
+        l10n_util::GetStringFUTF16(IDS_PROFILES_PRIMARY_ACCOUNT_REMOVAL_TEXT,
+            base::UTF8ToUTF16(account_id_to_remove_), settings_text, &offsets);
+    views::StyledLabel* primary_account_removal_label =
+        new views::StyledLabel(primmary_account_removal_text, this);
+    primary_account_removal_label->AddStyleRange(
+        gfx::Range(offsets[1], offsets[1] + settings_text.size()),
+        views::StyledLabel::RangeStyleInfo::CreateForLink());
+    primary_account_removal_label->SetBaseFontList(small_font_list);
+    layout->AddView(primary_account_removal_label);
+  } else {
+    views::Label* content_label = new views::Label(
+        l10n_util::GetStringUTF16(IDS_PROFILES_ACCOUNT_REMOVAL_TEXT));
+    content_label->SetMultiLine(true);
+    content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    content_label->SetFontList(small_font_list);
+    layout->AddView(content_label);
+  }
 
   // Adds button.
   if (!is_primary_account) {

[guohui, 2014-04-09 18:19:37]

The CQ bit was checked by guohui@chromium.org

[commit-bot: I haz the power, 2014-04-09 18:19:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/guohui@chromium.org/225963004/120001

[commit-bot: I haz the power, 2014-04-09 20:44:32]

Change committed as 262804