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

Side by Side Diff: chrome/browser/ui/views/instant_confirm_view.cc

Issue 6384002: views: Make CreatePanelGridLayout a static method of GridLayout class. (Closed)
Patch Set: fix trybots Created 9 years, 11 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/instant_confirm_view.h" 5 #include "chrome/browser/ui/views/instant_confirm_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/instant/instant_confirm_dialog.h" 10 #include "chrome/browser/instant/instant_confirm_dialog.h"
(...skipping 13 matching lines...) Expand all
24 views::Label* description_label = new views::Label( 24 views::Label* description_label = new views::Label(
25 UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE))); 25 UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)));
26 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 26 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
27 description_label->SetMultiLine(true); 27 description_label->SetMultiLine(true);
28 28
29 views::Link* learn_more_link = new views::Link( 29 views::Link* learn_more_link = new views::Link(
30 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE))); 30 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
31 learn_more_link->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 31 learn_more_link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
32 learn_more_link->SetController(this); 32 learn_more_link->SetController(this);
33 33
34 views::GridLayout* layout = CreatePanelGridLayout(this); 34 views::GridLayout* layout = views::GridLayout::CreatePanel(this);
35 SetLayoutManager(layout); 35 SetLayoutManager(layout);
36 36
37 const int first_column_set = 1; 37 const int first_column_set = 1;
38 views::ColumnSet* column_set = layout->AddColumnSet(first_column_set); 38 views::ColumnSet* column_set = layout->AddColumnSet(first_column_set);
39 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1, 39 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
40 views::GridLayout::USE_PREF, 0, 0); 40 views::GridLayout::USE_PREF, 0, 0);
41 layout->StartRow(0, first_column_set); 41 layout->StartRow(0, first_column_set);
42 layout->AddView(description_label); 42 layout->AddView(description_label);
43 layout->StartRow(0, first_column_set); 43 layout->StartRow(0, first_column_set);
44 layout->AddView(learn_more_link); 44 layout->AddView(learn_more_link);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 86
87 namespace browser { 87 namespace browser {
88 88
89 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { 89 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) {
90 views::Window::CreateChromeWindow(parent, gfx::Rect(), 90 views::Window::CreateChromeWindow(parent, gfx::Rect(),
91 new InstantConfirmView(profile))->Show(); 91 new InstantConfirmView(profile))->Show();
92 } 92 }
93 93
94 } // namespace browser 94 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/importing_progress_view.cc ('k') | chrome/browser/ui/views/keyword_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698