Chromium Code Reviews| Index: chrome/browser/chromeos/enrollment_dialog_view.cc |
| diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc |
| index cfab93da7affe423e7325dba572a92c394d86f0e..296e9f783f5fc5272b41bdc48ac355d6eb962ef5 100644 |
| --- a/chrome/browser/chromeos/enrollment_dialog_view.cc |
| +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc |
| @@ -10,8 +10,10 @@ |
| #include "chrome/browser/extensions/extension_host.h" |
| #include "chrome/browser/profiles/profile_manager.h" |
| #include "chrome/browser/ui/browser_finder.h" |
| -#include "chrome/browser/ui/browser_tabstrip.h" |
| +#include "chrome/browser/ui/browser_navigator.h" |
| +#include "chrome/browser/ui/browser_window.h" |
| #include "chrome/browser/ui/host_desktop.h" |
| +#include "chrome/browser/ui/singleton_tabs.h" |
| #include "content/public/common/page_transition_types.h" |
| #include "extensions/common/constants.h" |
| #include "grit/generated_resources.h" |
| @@ -106,20 +108,15 @@ int EnrollmentDialogView::GetDialogButtons() const { |
| } |
| bool EnrollmentDialogView::Accept() { |
| - // TODO(beng): use Navigate(). |
| - // Navigate to the target URI in a browser tab. |
| - Browser* browser = chrome::FindTabbedBrowser(profile_, false, |
| - chrome::HOST_DESKTOP_TYPE_ASH); |
| - if (!browser) { |
| - // Couldn't find a tabbed browser: create one. |
|
sky
2013/01/30 22:46:27
This does not show the browser.
|
| - browser = new Browser( |
| - Browser::CreateParams(Browser::TYPE_TABBED, |
| - profile_, |
| - chrome::HOST_DESKTOP_TYPE_ASH)); |
| - } |
| + Browser* browser = chrome::FindOrCreateTabbedBrowser( |
| + profile_, |
| + chrome::HOST_DESKTOP_TYPE_ASH); |
| DCHECK(browser); |
| - chrome::AddSelectedTabWithURL(browser, target_uri_, |
|
sky
2013/01/30 22:46:27
This does not show browser. So if you created a ne
|
| - content::PAGE_TRANSITION_LINK); |
| + chrome::NavigateParams params( |
| + chrome::GetSingletonTabNavigateParams(browser, GURL(target_uri_))); |
| + params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE; |
| + chrome::ShowSingletonTabOverwritingNTP(browser, params); |
| + browser->window()->Restore(); |
| return true; |
| } |