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/host_desktop.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_navigator.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"
+#include "ui/views/window/dialog_delegate.h"
 
 namespace chromeos {
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 350;
 const int kDefaultHeight = 100;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Dialog for certificate enrollment. This displays the content from the
 // certificate enrollment URI.
 class EnrollmentDialogView : public views::DialogDelegateView {
  public:
   virtual ~EnrollmentDialogView();
 
   static void ShowDialog(gfx::NativeWindow owning_window,
                          const std::string& network_name,
                          Profile* profile,
                          const GURL& target_uri,
                          const base::Closure& connect);
 
   // views::DialogDelegateView overrides
   virtual int GetDialogButtons() const OVERRIDE;
   virtual bool Accept() OVERRIDE;
+  virtual void OnClose() OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
 
   // views::WidgetDelegate overrides
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
 
   // views::View overrides
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
   EnrollmentDialogView(const std::string& network_name,
                        Profile* profile,
                        const GURL& target_uri,
                        const base::Closure& connect);
   void InitDialog();
 
+  bool accepted_;
   std::string network_name_;
   Profile* profile_;
   GURL target_uri_;
   base::Closure connect_;
   bool added_cert_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // EnrollmentDialogView implementation.
 
 EnrollmentDialogView::EnrollmentDialogView(const std::string& network_name,
                                            Profile* profile,
                                            const GURL& target_uri,
                                            const base::Closure& connect)
-    : network_name_(network_name),
+    : accepted_(false),
+      network_name_(network_name),
       profile_(profile),
       target_uri_(target_uri),
       connect_(connect),
       added_cert_(false) {
 }
 
 EnrollmentDialogView::~EnrollmentDialogView() {
 }
 
 // static
 void EnrollmentDialogView::ShowDialog(gfx::NativeWindow owning_window,
                                       const std::string& network_name,
                                       Profile* profile,
                                       const GURL& target_uri,
                                       const base::Closure& connect) {
   EnrollmentDialogView* dialog_view =
       new EnrollmentDialogView(network_name, profile, target_uri, connect);
   views::Widget::CreateWindowWithParent(dialog_view, owning_window);
   dialog_view->InitDialog();
   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.
-    browser = new Browser(
-        Browser::CreateParams(Browser::TYPE_TABBED,
-                              profile_,
-                              chrome::HOST_DESKTOP_TYPE_ASH));
-  }
-  DCHECK(browser);
-  chrome::AddSelectedTabWithURL(browser, target_uri_,
+  accepted_ = true;
+  return true;
+}
+
+void EnrollmentDialogView::OnClose() {
+  if (!accepted_)
+    return;
+  chrome::NavigateParams params(profile_,
+                                GURL(target_uri_),
                                 content::PAGE_TRANSITION_LINK);
-  return true;
+  params.disposition = NEW_FOREGROUND_TAB;
+  params.window_action = chrome::NavigateParams::SHOW_WINDOW;
+  chrome::Navigate(&params);
 }
 
 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);
 }
 
 ui::ModalType EnrollmentDialogView::GetModalType() const {
@@ skipping 112 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