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

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

Issue 2779973003: views: fold layout_utils::CreatePanelLayout into GridLayout::CreatePanel (Closed)
Patch Set: remove old DEPS entry Created 3 years, 8 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) 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/first_run_bubble.h" 5 #include "chrome/browser/ui/views/first_run_bubble.h"
6 6
7 #include "chrome/browser/first_run/first_run.h" 7 #include "chrome/browser/first_run/first_run.h"
8 #include "chrome/browser/search_engines/template_url_service_factory.h" 8 #include "chrome/browser/search_engines/template_url_service_factory.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/chrome_pages.h" 10 #include "chrome/browser/ui/chrome_pages.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 views::Link* change = 56 views::Link* change =
57 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE)); 57 new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
58 change->SetFontList(original_font_list); 58 change->SetFontList(original_font_list);
59 change->set_listener(this); 59 change->set_listener(this);
60 60
61 views::Label* subtext = new views::Label( 61 views::Label* subtext = new views::Label(
62 l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list}); 62 l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list});
63 63
64 views::GridLayout* layout = views::GridLayout::CreatePanel(this); 64 views::GridLayout* layout = views::GridLayout::CreatePanel(this);
65 SetLayoutManager(layout);
66 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset); 65 layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset);
67 66
68 views::ColumnSet* columns = layout->AddColumnSet(0); 67 views::ColumnSet* columns = layout->AddColumnSet(0);
69 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 68 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
70 views::GridLayout::USE_PREF, 0, 0); 69 views::GridLayout::USE_PREF, 0, 0);
71 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); 70 columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
72 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, 71 columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
73 views::GridLayout::USE_PREF, 0, 0); 72 views::GridLayout::USE_PREF, 0, 0);
74 columns->AddPaddingColumn(1, 0); 73 columns->AddPaddingColumn(1, 0);
75 74
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 135
137 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() { 136 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() {
138 if (!event_monitor_) 137 if (!event_monitor_)
139 return; 138 return;
140 139
141 event_monitor_.reset(); 140 event_monitor_.reset();
142 DCHECK(bubble_); 141 DCHECK(bubble_);
143 bubble_->GetWidget()->Close(); 142 bubble_->GetWidget()->Close();
144 bubble_ = nullptr; 143 bubble_ = nullptr;
145 } 144 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc ('k') | chrome/browser/ui/views/first_run_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698