OLD | NEW |
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/importing_progress_view.h" | 5 #include "chrome/browser/ui/views/importing_progress_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 "grit/chromium_strings.h" | 9 #include "grit/chromium_strings.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 return this; | 221 return this; |
222 } | 222 } |
223 | 223 |
224 //////////////////////////////////////////////////////////////////////////////// | 224 //////////////////////////////////////////////////////////////////////////////// |
225 // ImportingProgressView, private: | 225 // ImportingProgressView, private: |
226 | 226 |
227 void ImportingProgressView::InitControlLayout() { | 227 void ImportingProgressView::InitControlLayout() { |
228 using views::GridLayout; | 228 using views::GridLayout; |
229 using views::ColumnSet; | 229 using views::ColumnSet; |
230 | 230 |
231 GridLayout* layout = CreatePanelGridLayout(this); | 231 GridLayout* layout = GridLayout::CreatePanel(this); |
232 SetLayoutManager(layout); | 232 SetLayoutManager(layout); |
233 | 233 |
234 gfx::Size ps = state_history_->GetPreferredSize(); | 234 gfx::Size ps = state_history_->GetPreferredSize(); |
235 | 235 |
236 const int single_column_view_set_id = 0; | 236 const int single_column_view_set_id = 0; |
237 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); | 237 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); |
238 if (bookmarks_import_) { | 238 if (bookmarks_import_) { |
239 column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, | 239 column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, |
240 GridLayout::FIXED, ps.width(), 0); | 240 GridLayout::FIXED, ps.width(), 0); |
241 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 241 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 views::Window* window = | 307 views::Window* window = |
308 views::Window::CreateChromeWindow(parent_window, gfx::Rect(), v); | 308 views::Window::CreateChromeWindow(parent_window, gfx::Rect(), v); |
309 | 309 |
310 if (!coordinator->is_headless() && !first_run) | 310 if (!coordinator->is_headless() && !first_run) |
311 window->Show(); | 311 window->Show(); |
312 | 312 |
313 coordinator->StartImportSettings(source_profile, target_profile, items, | 313 coordinator->StartImportSettings(source_profile, target_profile, items, |
314 new ProfileWriter(target_profile), | 314 new ProfileWriter(target_profile), |
315 first_run); | 315 first_run); |
316 } | 316 } |
OLD | NEW |