diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 17:00:42 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 17:00:42 +0000 |
| commit | fbfc2ecd20639aa3c97a5579b5f854ed6792cb49 (patch) | |
| tree | bcf7ba566daf66d7e9a87c466d4b67986cbd34be /chrome/browser/sync/sync_setup_flow.cc | |
| parent | d363e92064f4cef9f3fe4622623ae057723a3923 (diff) | |
| download | chromium_src-fbfc2ecd20639aa3c97a5579b5f854ed6792cb49.zip chromium_src-fbfc2ecd20639aa3c97a5579b5f854ed6792cb49.tar.gz chromium_src-fbfc2ecd20639aa3c97a5579b5f854ed6792cb49.tar.bz2 | |
Set the options dialog as the parent window of the sync wizard when the
wizard is started from options.
BUG=19776
TEST=manually tested
Review URL: http://codereview.chromium.org/2976009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_flow.cc')
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index b1063bb..5eb62d6 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -469,7 +469,8 @@ void SyncSetupFlow::Focus() { SyncSetupFlow* SyncSetupFlow::Run(ProfileSyncService* service, SyncSetupFlowContainer* container, SyncSetupWizard::State start, - SyncSetupWizard::State end) { + SyncSetupWizard::State end, + gfx::NativeWindow parent_window) { DictionaryValue args; if (start == SyncSetupWizard::GAIA_LOGIN) SyncSetupFlow::GetArgsForGaiaLogin(service, &args); @@ -492,7 +493,7 @@ SyncSetupFlow* SyncSetupFlow::Run(ProfileSyncService* service, #else Browser* b = BrowserList::GetLastActive(); if (b) { - b->BrowserShowHtmlDialog(flow, NULL); + b->BrowserShowHtmlDialog(flow, parent_window); } else { delete flow; return NULL; |