Chromium Code Reviews| Index: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc |
| =================================================================== |
| --- chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc (revision 138102) |
| +++ chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc (working copy) |
| @@ -8,11 +8,11 @@ |
| #include "base/memory/singleton.h" |
| #include "base/utf_string_conversions.h" |
| #include "chrome/browser/platform_util.h" |
| -#include "chrome/browser/ui/browser.h" |
| +#include "chrome/browser/profiles/profile_manager.h" |
| #include "chrome/browser/ui/browser_dialogs.h" |
| -#include "chrome/browser/ui/browser_list.h" |
| #include "chrome/browser/ui/webui/web_dialog_delegate.h" |
| #include "chrome/common/url_constants.h" |
| +#include "content/public/browser/browser_thread.h" |
| #include "grit/generated_resources.h" |
| #include "ui/base/l10n/l10n_util.h" |
| @@ -72,10 +72,10 @@ |
| } |
| void MobileSetupDialogDelegate::ShowDialog() { |
| - Browser* browser = BrowserList::GetLastActive(); |
| - if (!browser) |
| - return; |
| - browser->BrowserShowWebDialog(this, NULL); |
| + browser::ShowWebDialog(NULL, |
| + ProfileManager::GetDefaultProfileOrOffTheRecord(), |
|
Ben Goodger (Google)
2012/05/22 17:58:30
Is this how you get the active profile on cros?
zel
2012/05/22 18:02:32
I think so, even though GetDefaultProfileOrOffTheR
Nikita (slow)
2012/05/23 19:01:20
This is an ugly hack that we're planning to get ri
|
| + NULL, |
| + this); |
| } |
| ui::ModalType MobileSetupDialogDelegate::GetDialogModalType() const { |