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

Side by Side Diff: chrome/browser/ui/views/clear_browsing_data_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/clear_browsing_data_view.h" 5 #include "chrome/browser/ui/views/clear_browsing_data_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_window.h" 10 #include "chrome/browser/browser_window.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 GridLayout::USE_PREF, 0, 0); 149 GridLayout::USE_PREF, 0, 0);
150 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); 150 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
151 column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, 151 column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
152 GridLayout::USE_PREF, 0, 0); 152 GridLayout::USE_PREF, 0, 0);
153 layout->StartRow(1, 0); 153 layout->StartRow(1, 0);
154 layout->AddView(throbber_); 154 layout->AddView(throbber_);
155 layout->AddView(status_label_); 155 layout->AddView(status_label_);
156 } 156 }
157 157
158 void ClearBrowsingDataView2::InitControlLayout() { 158 void ClearBrowsingDataView2::InitControlLayout() {
159 GridLayout* layout = CreatePanelGridLayout(this); 159 GridLayout* layout = GridLayout::CreatePanel(this);
160 this->SetLayoutManager(layout); 160 this->SetLayoutManager(layout);
161 161
162 int leading_column_set_id = 0; 162 int leading_column_set_id = 0;
163 views::ColumnSet* column_set = layout->AddColumnSet(leading_column_set_id); 163 views::ColumnSet* column_set = layout->AddColumnSet(leading_column_set_id);
164 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1, 164 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
165 GridLayout::USE_PREF, 0, 0); 165 GridLayout::USE_PREF, 0, 0);
166 166
167 const int indented_column_set_id = 1; 167 const int indented_column_set_id = 1;
168 column_set = layout->AddColumnSet(indented_column_set_id); 168 column_set = layout->AddColumnSet(indented_column_set_id);
169 column_set->AddPaddingColumn(0, views::Checkbox::GetTextIndent()); 169 column_set->AddPaddingColumn(0, views::Checkbox::GetTextIndent());
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 remover_ = new BrowsingDataRemover(profile_, 364 remover_ = new BrowsingDataRemover(profile_,
365 static_cast<BrowsingDataRemover::TimePeriod>(period_selected), 365 static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
366 base::Time()); 366 base::Time());
367 remover_->AddObserver(this); 367 remover_->AddObserver(this);
368 remover_->Remove(remove_mask); 368 remover_->Remove(remove_mask);
369 } 369 }
370 370
371 void ClearBrowsingDataView2::OnBrowsingDataRemoverDone() { 371 void ClearBrowsingDataView2::OnBrowsingDataRemoverDone() {
372 clear_data_parent_window_->StopClearingBrowsingData(); 372 clear_data_parent_window_->StopClearingBrowsingData();
373 } 373 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmark_editor_view.cc ('k') | chrome/browser/ui/views/clear_server_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698