Fix crash when opening "Select certificate file" in OOBE.

chrome/browser/views/select_file_dialog.cc

 // Copyright (c) 2010 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/shell_dialogs.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/html_dialog_view.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
+#include "chrome/browser/profile_manager.h"
+
 namespace {
 
 static const wchar_t* kKeyNamePath = L"path";
 static const int kSaveCompletePageIndex = 2;
 
 };  // namespace
 
 // Implementation of SelectFileDialog that shows an UI for choosing a file
 // or folder using FileBrowseUI.
 class SelectFileDialogImpl : public SelectFileDialog {
  public:
   explicit SelectFileDialogImpl(Listener* listener);
 
   // BaseShellDialog implementation.
   virtual bool IsRunning(gfx::NativeWindow parent_window) const;
   virtual void ListenerDestroyed();
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
   virtual void SelectFile(Type type,
                           const string16& title,
                           const FilePath& default_path,
                           const FileTypeInfo* file_types,
                           int file_type_index,
                           const FilePath::StringType& default_extension,
                           gfx::NativeWindow owning_window,
                           void* params);
 
+  virtual void set_browser_mode(bool value) {
+    browser_mode_ = value;
+  }
+
  private:
   virtual ~SelectFileDialogImpl();
 
   class FileBrowseDelegate : public HtmlDialogUIDelegate {
    public:
     FileBrowseDelegate(SelectFileDialogImpl* owner,
                        Type type,
                        const std::wstring& title,
                        const FilePath& default_path,
                        const FileTypeInfo* file_types,
@@ skipping 58 matching lines @@
 
    private:
     FileBrowseDelegate* delegate_;
 
     DISALLOW_COPY_AND_ASSIGN(FileBrowseDelegateHandler);
   };
 
   // Notification from FileBrowseDelegate when file browse UI is dismissed.
   void OnDialogClosed(FileBrowseDelegate* delegate, const std::string& json);
 
+  // Callback method to open HTML
+  void OpenHtmlDialog(gfx::NativeWindow owning_window,
+                      FileBrowseDelegate* file_browse_delegate);
+
   // The set of all parent windows for which we are currently running dialogs.
   std::set<gfx::NativeWindow> parents_;
 
   // The set of all FileBrowseDelegate that we are currently running.
   std::set<FileBrowseDelegate*> delegates_;
 
+  // True when opening in browser, otherwise in OOBE/login mode.
+  bool browser_mode_;
+
   // The listener to be notified of selection completion.
   Listener* listener_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImpl);
 };
 
 // static
 SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
   DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::IO));
   DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::FILE));
   return new SelectFileDialogImpl(listener);
 }
 
 SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener)
-    : listener_(listener) {
+    : browser_mode_(true),
+      listener_(listener) {
 }
 
 SelectFileDialogImpl::~SelectFileDialogImpl() {
   // All dialogs should be dismissed by now.
   DCHECK(parents_.empty() && delegates_.empty());
 }
 
 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
   return parent_window && parents_.find(parent_window) != parents_.end();
 }
@@ skipping 35 matching lines @@
   }
 
   if (owning_window)
     parents_.insert(owning_window);
 
   FileBrowseDelegate* file_browse_delegate = new FileBrowseDelegate(this,
       type, title_string, default_path, file_types, file_type_index,
       default_extension, owning_window, params);
   delegates_.insert(file_browse_delegate);
 
-  Browser* browser = BrowserList::GetLastActive();
-  DCHECK(browser);
-  browser->BrowserShowHtmlDialog(file_browse_delegate, owning_window);
+  if (browser_mode_) {
+    Browser* browser = BrowserList::GetLastActive();
+    DCHECK(browser);
+    browser->BrowserShowHtmlDialog(file_browse_delegate, owning_window);
+  } else {
+    ChromeThread::PostTask(
+        ChromeThread::UI,
+        FROM_HERE,
+        NewRunnableMethod(this,
+                          &SelectFileDialogImpl::OpenHtmlDialog,
+                          owning_window,
+                          file_browse_delegate));
+  }
 }
 
 void SelectFileDialogImpl::OnDialogClosed(FileBrowseDelegate* delegate,
                                           const std::string& json) {
   // Nothing to do if listener_ is gone.
 
   if (!listener_)
     return;
 
   bool notification_fired = false;
@@ skipping 42 matching lines @@
   }
 
   // Always notify listener when dialog is dismissed.
   if (!notification_fired)
     listener_->FileSelectionCanceled(delegate->params_);
 
   parents_.erase(delegate->parent_);
   delegates_.erase(delegate);
 }
 
+void SelectFileDialogImpl::OpenHtmlDialog(
+    gfx::NativeWindow owning_window,
+    FileBrowseDelegate* file_browse_delegate) {
+  browser::ShowHtmlDialogView(owning_window,
+                              ProfileManager::GetDefaultProfile(),
+                              file_browse_delegate);
+}
+
 SelectFileDialogImpl::FileBrowseDelegate::FileBrowseDelegate(
     SelectFileDialogImpl* owner,
     Type type,
     const std::wstring& title,
     const FilePath& default_path,
     const FileTypeInfo* file_types,
     int file_type_index,
     const FilePath::StringType& default_extension,
     gfx::NativeWindow parent,
     void* params)
@@ skipping 154 matching lines @@
     // TODO(xiyuan): Change this when the infrastructure is improved.
     HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor().
         GetProperty(dom_ui_->tab_contents()->property_bag());
     HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate);
     DCHECK(containing_view);
 
     containing_view->GetWindow()->UpdateWindowTitle();
     containing_view->GetWindow()->GetNonClientView()->SchedulePaint();
   }
 }