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

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

Issue 6382009: views: Move grid_layout files into layout directory. Final Part. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/importing_progress_view.h" 5 #include "chrome/browser/ui/views/importing_progress_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "grit/chromium_strings.h" 8 #include "grit/chromium_strings.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "grit/locale_settings.h" 10 #include "grit/locale_settings.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 #include "views/controls/label.h" 12 #include "views/controls/label.h"
13 #include "views/controls/throbber.h" 13 #include "views/controls/throbber.h"
14 #include "views/grid_layout.h" 14 #include "views/layout/grid_layout.h"
15 #include "views/layout/layout_constants.h" 15 #include "views/layout/layout_constants.h"
16 #include "views/window/window.h" 16 #include "views/window/window.h"
17 17
18 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
19 // ImportingProgressView, public: 19 // ImportingProgressView, public:
20 20
21 ImportingProgressView::ImportingProgressView(const std::wstring& source_name, 21 ImportingProgressView::ImportingProgressView(const std::wstring& source_name,
22 int16 items, 22 int16 items,
23 ImporterHost* coordinator, 23 ImporterHost* coordinator,
24 ImportObserver* observer, 24 ImportObserver* observer,
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/importer_view.cc ('k') | chrome/browser/ui/views/indexed_db_info_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698