Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8815)

Unified Diff: chrome/browser/ui/views/profile_chooser_view.cc

Issue 137193005: [Win] Unbreak the new avatar bubble size when using the embedded view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bac70b3aedfbc37010803f6450cf018413557ddf..a7342c245799bbdf82e2131719d7ba71f970f379 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -431,8 +431,6 @@ void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
RemoveAllChildViews(true);
view_mode_ = view_to_display;
- views::GridLayout* layout = CreateSingleColumnLayout(this, kFixedMenuWidth);
-
if (view_to_display == GAIA_SIGNIN_VIEW ||
view_to_display == GAIA_ADD_ACCOUNT_VIEW) {
// Minimum size for embedded sign in pages as defined in Gaia.
@@ -446,6 +444,8 @@ void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
GURL url(signin::GetPromoURL(
source, false /* auto_close */, true /* is_constrained */));
web_view->LoadInitialURL(url);
+ views::GridLayout* layout =
+ CreateSingleColumnLayout(this, kMinGaiaViewWidth);
layout->StartRow(1, 0);
layout->AddView(web_view);
layout->set_minimum_size(
@@ -456,6 +456,7 @@ void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
return;
}
+ views::GridLayout* layout = CreateSingleColumnLayout(this, kFixedMenuWidth);
// Separate items into active and alternatives.
Indexes other_profiles;
bool is_guest_view = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698