OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" | 5 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/lifetime/application_lifetime.h" | 10 #include "chrome/browser/lifetime/application_lifetime.h" |
(...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1287 views::View* view = new views::View(); | 1287 views::View* view = new views::View(); |
1288 views::GridLayout* layout = CreateSingleColumnLayout( | 1288 views::GridLayout* layout = CreateSingleColumnLayout( |
1289 view, kFixedMenuWidth - 2 * views::kButtonHEdgeMarginNew); | 1289 view, kFixedMenuWidth - 2 * views::kButtonHEdgeMarginNew); |
1290 layout->SetInsets(views::kRelatedControlVerticalSpacing, | 1290 layout->SetInsets(views::kRelatedControlVerticalSpacing, |
1291 views::kButtonHEdgeMarginNew, | 1291 views::kButtonHEdgeMarginNew, |
1292 views::kRelatedControlVerticalSpacing, | 1292 views::kRelatedControlVerticalSpacing, |
1293 views::kButtonHEdgeMarginNew); | 1293 views::kButtonHEdgeMarginNew); |
1294 views::Label* disclaimer = new views::Label( | 1294 views::Label* disclaimer = new views::Label( |
1295 avatar_menu_->GetSupervisedUserInformation()); | 1295 avatar_menu_->GetSupervisedUserInformation()); |
1296 disclaimer->SetMultiLine(true); | 1296 disclaimer->SetMultiLine(true); |
| 1297 disclaimer->SetAllowCharacterBreak(true); |
1297 disclaimer->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 1298 disclaimer->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
1298 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); | 1299 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
1299 disclaimer->SetFontList(rb->GetFontList(ui::ResourceBundle::SmallFont)); | 1300 disclaimer->SetFontList(rb->GetFontList(ui::ResourceBundle::SmallFont)); |
1300 layout->StartRow(1, 0); | 1301 layout->StartRow(1, 0); |
1301 layout->AddView(disclaimer); | 1302 layout->AddView(disclaimer); |
1302 | 1303 |
1303 return view; | 1304 return view; |
1304 } | 1305 } |
1305 | 1306 |
1306 views::View* ProfileChooserView::CreateCurrentProfileAccountsView( | 1307 views::View* ProfileChooserView::CreateCurrentProfileAccountsView( |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1635 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != | 1636 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != |
1636 IncognitoModePrefs::DISABLED; | 1637 IncognitoModePrefs::DISABLED; |
1637 return incognito_available && !browser_->profile()->IsGuestSession(); | 1638 return incognito_available && !browser_->profile()->IsGuestSession(); |
1638 } | 1639 } |
1639 | 1640 |
1640 void ProfileChooserView::PostActionPerformed( | 1641 void ProfileChooserView::PostActionPerformed( |
1641 ProfileMetrics::ProfileDesktopMenu action_performed) { | 1642 ProfileMetrics::ProfileDesktopMenu action_performed) { |
1642 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); | 1643 ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_); |
1643 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; | 1644 gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE; |
1644 } | 1645 } |
OLD | NEW |