Fixing opening a new tab if none exists to show the enrollment URI for certificates.

chrome/browser/chromeos/enrollment_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 74 matching lines @@
   views::Widget* widget = dialog_view->GetWidget();
   DCHECK(widget);
   widget->Show();
 }
 
 int EnrollmentDialogView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_CANCEL | ui::DIALOG_BUTTON_OK;
 }
 
 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 new browser (or you found a
browser in another workspace) it won't be shown. The bug is here, you need to
show and activate the browser.

-                                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;
 }
 
 string16 EnrollmentDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_BUTTON);
   return views::DialogDelegateView::GetDialogButtonLabel(button);
 }
 
@@ skipping 113 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function.
 
 EnrollmentDelegate* CreateEnrollmentDelegate(gfx::NativeWindow owning_window,
                                              const std::string& network_name,
                                              Profile* profile) {
   return new DialogEnrollmentDelegate(owning_window, network_name, profile);
 }
 
 }  // namespace chromeos