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

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

Issue 6374011: views: Move layout_manager.[cc,h] into layout directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: layout-manager 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 | Annotate | Revision Log
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 "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_list.h" 8 #include "chrome/browser/browser_list.h"
9 #include "chrome/browser/instant/instant_confirm_dialog.h" 9 #include "chrome/browser/instant/instant_confirm_dialog.h"
10 #include "chrome/browser/instant/instant_controller.h" 10 #include "chrome/browser/instant/instant_controller.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/chromium_strings.h" 14 #include "grit/chromium_strings.h"
15 #include "grit/locale_settings.h" 15 #include "grit/locale_settings.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "views/controls/label.h" 17 #include "views/controls/label.h"
18 #include "views/grid_layout.h" 18 #include "views/grid_layout.h"
19 #include "views/layout_manager.h"
20 #include "views/standard_layout.h" 19 #include "views/standard_layout.h"
21 #include "views/window/window.h" 20 #include "views/window/window.h"
22 21
23 InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) { 22 InstantConfirmView::InstantConfirmView(Profile* profile) : profile_(profile) {
24 views::Label* description_label = new views::Label( 23 views::Label* description_label = new views::Label(
25 UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE))); 24 UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)));
26 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 25 description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
27 description_label->SetMultiLine(true); 26 description_label->SetMultiLine(true);
28 27
29 views::Link* learn_more_link = new views::Link( 28 views::Link* learn_more_link = new views::Link(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 84 }
86 85
87 namespace browser { 86 namespace browser {
88 87
89 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { 88 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) {
90 views::Window::CreateChromeWindow(parent, gfx::Rect(), 89 views::Window::CreateChromeWindow(parent, gfx::Rect(),
91 new InstantConfirmView(profile))->Show(); 90 new InstantConfirmView(profile))->Show();
92 } 91 }
93 92
94 } // namespace browser 93 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698