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

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc

Issue 148093008: Create a dialog that warns about possible UI-oddities of the multi-profiles window teleport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style fix 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 unified diff | Download patch
OLDNEW
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/chromeos/profiles/multiprofiles_intro_dialog.h" 5 #include "chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/views/controls/button/checkbox.h" 11 #include "ui/views/controls/button/checkbox.h"
12 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
13 #include "ui/views/layout/grid_layout.h" 13 #include "ui/views/layout/grid_layout.h"
14 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 #include "ui/views/window/dialog_delegate.h" 15 #include "ui/views/window/dialog_delegate.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 namespace { 19 namespace {
20 20
21 // Default width/height of the dialog. 21 // Default width/height of the dialog.
22 const int kDefaultWidth = 600; 22 const int kDefaultWidth = 600;
23 const int kDefaultHeight = 250; 23 const int kDefaultHeight = 250;
24 24
25 const int kPaddingToMessage = 20; 25 const int kPaddingToMessage = 30;
26 const int kPaddingToCheckBox = 50; 26 const int kPaddingToCheckBox = 50;
27 const int kInset = 40; 27 const int kInset = 40;
28 const int kTopInset = 10; 28 const int kTopInset = 10;
29 29
30 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
31 // Dialog for multi-profiles introduction. 31 // Dialog for multi-profiles teleport warning.
32 class MultiprofilesIntroView : public views::DialogDelegateView { 32 class TeleportWarningView : public views::DialogDelegateView {
33 public: 33 public:
34 explicit MultiprofilesIntroView(const base::Callback<void(bool)> on_accept); 34 TeleportWarningView(base::Callback<void(bool)> on_accept);
35 virtual ~MultiprofilesIntroView(); 35 virtual ~TeleportWarningView();
36 36
37 static void ShowDialog(const base::Callback<void(bool)> on_accept); 37 static void ShowDialog(const base::Callback<void(bool)> on_accept);
38 38
39 // views::DialogDelegate overrides. 39 // views::DialogDelegate overrides.
40 virtual bool Accept() OVERRIDE; 40 virtual bool Accept() OVERRIDE;
41 41
42 // views::WidgetDelegate overrides. 42 // views::WidgetDelegate overrides.
43 virtual ui::ModalType GetModalType() const OVERRIDE; 43 virtual ui::ModalType GetModalType() const OVERRIDE;
44 44
45 // views::View overrides. 45 // views::View overrides.
46 virtual gfx::Size GetPreferredSize() OVERRIDE; 46 virtual gfx::Size GetPreferredSize() OVERRIDE;
47 47
48 static int reciever_user_id;
ygorshenin1 2014/01/29 09:24:04 s/reciever/receiver/ Why do you need this static
merkulova 2014/01/29 09:46:21 It was a trash line, sorry.
49
48 private: 50 private:
49 void InitDialog(); 51 void InitDialog();
50 52
51 scoped_ptr<views::Checkbox> no_show_checkbox_; 53 scoped_ptr<views::Checkbox> no_show_checkbox_;
52 const base::Callback<void(bool)> on_accept_; 54 const base::Callback<void(bool)> on_accept_;
53 55
54 DISALLOW_COPY_AND_ASSIGN(MultiprofilesIntroView); 56 DISALLOW_COPY_AND_ASSIGN(TeleportWarningView);
55 }; 57 };
56 58
57 //////////////////////////////////////////////////////////////////////////////// 59 ////////////////////////////////////////////////////////////////////////////////
58 // MultiprofilesIntroDialog implementation. 60 // TeleportWarningView implementation.
59 61
60 MultiprofilesIntroView::MultiprofilesIntroView( 62 TeleportWarningView::TeleportWarningView(
61 const base::Callback<void(bool)> on_accept) 63 const base::Callback<void(bool)> on_accept)
62 : on_accept_(on_accept) { 64 : on_accept_(on_accept) {
63 } 65 }
64 66
65 MultiprofilesIntroView::~MultiprofilesIntroView() { 67 TeleportWarningView::~TeleportWarningView() {
66 } 68 }
67 69
68 // static 70 // static
69 void MultiprofilesIntroView::ShowDialog( 71 void TeleportWarningView::ShowDialog(
70 const base::Callback<void(bool)> on_accept) { 72 const base::Callback<void(bool)> on_accept) {
71 MultiprofilesIntroView* dialog_view = 73 TeleportWarningView* dialog_view =
72 new MultiprofilesIntroView(on_accept); 74 new TeleportWarningView(on_accept);
73 views::DialogDelegate::CreateDialogWidget( 75 views::DialogDelegate::CreateDialogWidget(
74 dialog_view, ash::Shell::GetTargetRootWindow(), NULL); 76 dialog_view, ash::Shell::GetTargetRootWindow(), NULL);
75 dialog_view->InitDialog(); 77 dialog_view->InitDialog();
76 views::Widget* widget = dialog_view->GetWidget(); 78 views::Widget* widget = dialog_view->GetWidget();
77 DCHECK(widget); 79 DCHECK(widget);
78 widget->Show(); 80 widget->Show();
79 } 81 }
80 82
81 bool MultiprofilesIntroView::Accept() { 83 bool TeleportWarningView::Accept() {
82 on_accept_.Run(no_show_checkbox_->checked()); 84 on_accept_.Run(no_show_checkbox_->checked());
83 return true; 85 return true;
84 } 86 }
85 87
86 ui::ModalType MultiprofilesIntroView::GetModalType() const { 88 ui::ModalType TeleportWarningView::GetModalType() const {
87 return ui::MODAL_TYPE_SYSTEM; 89 return ui::MODAL_TYPE_SYSTEM;
88 } 90 }
89 91
90 gfx::Size MultiprofilesIntroView::GetPreferredSize() { 92 gfx::Size TeleportWarningView::GetPreferredSize() {
91 return gfx::Size(kDefaultWidth, kDefaultHeight); 93 return gfx::Size(kDefaultWidth, kDefaultHeight);
92 } 94 }
93 95
94 void MultiprofilesIntroView::InitDialog() { 96 void TeleportWarningView::InitDialog() {
95 const gfx::Insets kDialogInsets(kTopInset, kInset, kInset, kInset); 97 const gfx::Insets kDialogInsets(kTopInset, kInset, kInset, kInset);
96 98
97 // Create the views and layout manager and set them up. 99 // Create the views and layout manager and set them up.
98 views::GridLayout* grid_layout = views::GridLayout::CreatePanel(this); 100 views::GridLayout* grid_layout = views::GridLayout::CreatePanel(this);
99 grid_layout->SetInsets(kDialogInsets); 101 grid_layout->SetInsets(kDialogInsets);
100 102
101 views::ColumnSet* column_set = grid_layout->AddColumnSet(0); 103 views::ColumnSet* column_set = grid_layout->AddColumnSet(0);
102 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, 104 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
103 views::GridLayout::USE_PREF, 0, 0); 105 views::GridLayout::USE_PREF, 0, 0);
104 106
107 // Title
105 views::Label* title_label_ = new views::Label( 108 views::Label* title_label_ = new views::Label(
106 l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_HEADLINE)); 109 l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_TITLE));
107 title_label_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList( 110 title_label_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
108 ui::ResourceBundle::MediumBoldFont)); 111 ui::ResourceBundle::MediumBoldFont));
109 title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 112 title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
110 grid_layout->StartRow(0, 0); 113 grid_layout->StartRow(0, 0);
111 grid_layout->AddView(title_label_); 114 grid_layout->AddView(title_label_);
112 grid_layout->AddPaddingRow(0, kPaddingToMessage); 115 grid_layout->AddPaddingRow(0, kPaddingToMessage);
113 116
114 // Explanation string. 117 // Explanation string
115 views::Label* label = new views::Label( 118 views::Label* label = new views::Label(
116 l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_MESSAGE)); 119 l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_MESSAGE));
117 label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList( 120 label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
118 ui::ResourceBundle::MediumFont)); 121 ui::ResourceBundle::MediumFont));
119 label->SetMultiLine(true); 122 label->SetMultiLine(true);
120 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 123 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
121 label->SetAllowCharacterBreak(true); 124 label->SetAllowCharacterBreak(true);
122 grid_layout->StartRow(0, 0); 125 grid_layout->StartRow(0, 0);
123 grid_layout->AddView(label); 126 grid_layout->AddView(label);
124 127
125 // Next explanation string. 128 // Next explanation string
126 grid_layout->AddPaddingRow(0, kPaddingToMessage); 129 grid_layout->AddPaddingRow(0, kPaddingToMessage);
127 views::Label* lower_label = new views::Label( 130 views::Label* lower_label = new views::Label(
128 l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_EXPLANATION)); 131 l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_EXPLANATION));
129 lower_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList( 132 lower_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
130 ui::ResourceBundle::MediumFont)); 133 ui::ResourceBundle::MediumFont));
131 lower_label->SetMultiLine(true); 134 lower_label->SetMultiLine(true);
132 lower_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 135 lower_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
133 lower_label->SetAllowCharacterBreak(true); 136 lower_label->SetAllowCharacterBreak(true);
134 grid_layout->StartRow(0, 0); 137 grid_layout->StartRow(0, 0);
135 grid_layout->AddView(lower_label); 138 grid_layout->AddView(lower_label);
136 139
137 // No-show again checkbox. 140 // No-show again checkbox
138 grid_layout->AddPaddingRow(0, kPaddingToCheckBox); 141 grid_layout->AddPaddingRow(0, kPaddingToCheckBox);
139 no_show_checkbox_.reset(new views::Checkbox( 142 no_show_checkbox_.reset(new views::Checkbox(
140 l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_NOSHOW_AGAIN))); 143 l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_SHOW_DISMISS)));
141 no_show_checkbox_->SetChecked(true); 144 no_show_checkbox_->SetChecked(true);
142 no_show_checkbox_->SetFontList( 145 no_show_checkbox_->SetFontList(
143 ui::ResourceBundle::GetSharedInstance().GetFontList( 146 ui::ResourceBundle::GetSharedInstance().GetFontList(
144 ui::ResourceBundle::MediumFont)); 147 ui::ResourceBundle::MediumFont));
145 no_show_checkbox_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
146 grid_layout->StartRow(0, 0); 148 grid_layout->StartRow(0, 0);
147 grid_layout->AddView(no_show_checkbox_.get()); 149 grid_layout->AddView(no_show_checkbox_.get());
148 150
149 SetLayoutManager(grid_layout); 151 SetLayoutManager(grid_layout);
150 Layout(); 152 Layout();
151 } 153 }
152 154
153 } // namespace 155 } // namespace
154 156
155 //////////////////////////////////////////////////////////////////////////////// 157 ////////////////////////////////////////////////////////////////////////////////
156 // Factory function. 158 // Factory function.
157 159
158 void ShowMultiprofilesIntroDialog(const base::Callback<void(bool)> on_accept) { 160 void ShowMultiprofilesWarningDialog(
159 MultiprofilesIntroView::ShowDialog(on_accept); 161 const base::Callback<void(bool)> on_accept) {
162 TeleportWarningView::ShowDialog(on_accept);
160 } 163 }
161 164
162 } // namespace chromeos 165 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698