OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/login_view.h" | 5 #include "chrome/browser/ui/views/login_view.h" |
6 | 6 |
7 #include "chrome/grit/generated_resources.h" | 7 #include "chrome/grit/generated_resources.h" |
8 #include "ui/base/l10n/l10n_util.h" | 8 #include "ui/base/l10n/l10n_util.h" |
9 #include "ui/views/background.h" | |
meacer
2015/11/20 00:31:30
Not needed I think
palmer
2015/11/20 01:29:53
Done.
| |
9 #include "ui/views/controls/label.h" | 10 #include "ui/views/controls/label.h" |
10 #include "ui/views/controls/textfield/textfield.h" | 11 #include "ui/views/controls/textfield/textfield.h" |
11 #include "ui/views/layout/grid_layout.h" | 12 #include "ui/views/layout/grid_layout.h" |
12 #include "ui/views/layout/layout_constants.h" | 13 #include "ui/views/layout/layout_constants.h" |
13 | 14 |
14 static const int kMessageWidth = 320; | 15 static const int kMessageWidth = 320; |
15 static const int kTextfieldStackHorizontalSpacing = 30; | 16 static const int kTextfieldStackHorizontalSpacing = 30; |
16 | 17 |
17 using password_manager::LoginModel; | 18 using password_manager::LoginModel; |
18 using views::GridLayout; | 19 using views::GridLayout; |
19 | 20 |
20 /////////////////////////////////////////////////////////////////////////////// | 21 /////////////////////////////////////////////////////////////////////////////// |
21 // LoginView, public: | 22 // LoginView, public: |
22 | 23 |
23 LoginView::LoginView(const base::string16& explanation, | 24 LoginView::LoginView(const base::string16& authority, |
25 const base::string16& explanation, | |
24 LoginHandler::LoginModelData* login_model_data) | 26 LoginHandler::LoginModelData* login_model_data) |
25 : username_field_(new views::Textfield()), | 27 : username_field_(new views::Textfield()), |
26 password_field_(new views::Textfield()), | 28 password_field_(new views::Textfield()), |
27 username_label_(new views::Label( | 29 username_label_(new views::Label( |
28 l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD))), | 30 l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD))), |
29 password_label_(new views::Label( | 31 password_label_(new views::Label( |
30 l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD))), | 32 l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD))), |
33 authority_label_(new views::Label(authority)), | |
31 message_label_(new views::Label(explanation)), | 34 message_label_(new views::Label(explanation)), |
32 login_model_(login_model_data ? login_model_data->model : nullptr) { | 35 login_model_(login_model_data ? login_model_data->model : nullptr) { |
33 password_field_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD); | 36 password_field_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD); |
37 | |
38 authority_label_->SetMultiLine(true); | |
39 authority_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); | |
40 authority_label_->SetAllowCharacterBreak(true); | |
41 | |
34 message_label_->SetMultiLine(true); | 42 message_label_->SetMultiLine(true); |
35 message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 43 message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
36 message_label_->SetAllowCharacterBreak(true); | 44 message_label_->SetAllowCharacterBreak(true); |
37 | 45 |
38 // Initialize the Grid Layout Manager used for this dialog box. | 46 // Initialize the Grid Layout Manager used for this dialog box. |
39 GridLayout* layout = GridLayout::CreatePanel(this); | 47 GridLayout* layout = GridLayout::CreatePanel(this); |
40 SetLayoutManager(layout); | 48 SetLayoutManager(layout); |
41 | 49 |
42 // Add the column set for the information message at the top of the dialog | 50 // Add the column set for the information message at the top of the dialog |
43 // box. | 51 // box. |
44 const int single_column_view_set_id = 0; | 52 const int single_column_view_set_id = 0; |
45 views::ColumnSet* column_set = | 53 views::ColumnSet* column_set = |
46 layout->AddColumnSet(single_column_view_set_id); | 54 layout->AddColumnSet(single_column_view_set_id); |
47 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 55 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
48 GridLayout::FIXED, kMessageWidth, 0); | 56 GridLayout::FIXED, kMessageWidth, 0); |
49 | 57 |
50 // Add the column set for the user name and password fields and labels. | 58 // Add the column set for the user name and password fields and labels. |
51 const int labels_column_set_id = 1; | 59 const int labels_column_set_id = 1; |
52 column_set = layout->AddColumnSet(labels_column_set_id); | 60 column_set = layout->AddColumnSet(labels_column_set_id); |
53 column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing); | 61 column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing); |
54 column_set->AddColumn(views::kControlLabelGridAlignment, GridLayout::CENTER, | 62 column_set->AddColumn(views::kControlLabelGridAlignment, GridLayout::CENTER, |
55 0, GridLayout::USE_PREF, 0, 0); | 63 0, GridLayout::USE_PREF, 0, 0); |
56 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); | 64 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); |
57 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, | 65 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, |
58 GridLayout::USE_PREF, 0, 0); | 66 GridLayout::USE_PREF, 0, 0); |
59 column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing); | 67 column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing); |
60 | 68 |
61 layout->StartRow(0, single_column_view_set_id); | 69 layout->StartRow(0, single_column_view_set_id); |
62 layout->AddView(message_label_); | 70 layout->AddView(authority_label_); |
71 if (!explanation.empty()) { | |
72 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); | |
73 layout->StartRow(0, single_column_view_set_id); | |
74 layout->AddView(message_label_); | |
75 } | |
63 | 76 |
64 layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing); | 77 layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing); |
65 | 78 |
66 layout->StartRow(0, labels_column_set_id); | 79 layout->StartRow(0, labels_column_set_id); |
67 layout->AddView(username_label_); | 80 layout->AddView(username_label_); |
68 layout->AddView(username_field_); | 81 layout->AddView(username_field_); |
69 | 82 |
70 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); | 83 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
71 | 84 |
72 layout->StartRow(0, labels_column_set_id); | 85 layout->StartRow(0, labels_column_set_id); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
113 | 126 |
114 void LoginView::OnLoginModelDestroying() { | 127 void LoginView::OnLoginModelDestroying() { |
115 login_model_->RemoveObserver(this); | 128 login_model_->RemoveObserver(this); |
116 login_model_ = NULL; | 129 login_model_ = NULL; |
117 } | 130 } |
118 | 131 |
119 const char* LoginView::GetClassName() const { | 132 const char* LoginView::GetClassName() const { |
120 return "LoginView"; | 133 return "LoginView"; |
121 } | 134 } |
122 | 135 |
OLD | NEW |