summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorcpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:44:54 +0000
committercpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:44:54 +0000
commit6cd5bfff0526b34183e4a5508920b11515e4461b (patch)
tree2cdf258eddd73793809a2f7e1fb51165dddb200a /chrome/browser/views
parentaa156ca673791d7dfeffd02862c28a7b25f08c7c (diff)
downloadchromium_src-6cd5bfff0526b34183e4a5508920b11515e4461b.zip
chromium_src-6cd5bfff0526b34183e4a5508920b11515e4461b.tar.gz
chromium_src-6cd5bfff0526b34183e4a5508920b11515e4461b.tar.bz2
On first run process the master prefs json, only one entry matters to us.
- skip or not first run dialgos - on skip import silently search provider only BUG=1394863 Review URL: http://codereview.chromium.org/8758 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/importing_progress_view.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index 203cea2..3d759ef 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -278,7 +278,14 @@ void StartImportingWithUI(HWND parent_window,
DCHECK(items != 0);
ImportingProgressView* v = new ImportingProgressView(
source_profile.description, items, coordinator, observer, parent_window);
- views::Window::CreateChromeWindow(parent_window, gfx::Rect(), v)->Show();
+ views::Window* window =
+ views::Window::CreateChromeWindow(parent_window, gfx::Rect(), v);
+
+ // In headless mode it means that we don't show the progress window, but it
+ // still need it to exist. No user interaction will be required.
+ if (!coordinator->is_headless())
+ window->Show();
+
coordinator->StartImportSettings(source_profile, items,
new ProfileWriter(target_profile),
first_run);