Aura impl of Linux Process Singleton Dialog.

Move call of aura::Env::CreateInstance() even earlier in chrome_browser_main.cc.

BUG=284564

Review URL: https://codereview.chromium.org/80153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236677 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 46 deletions

diff --git a/chrome/browser/ui/gtk/process_singleton_dialog.cc b/chrome/browser/ui/gtk/process_singleton_dialog.cc
index d6c8015..b34b0f0 100644
--- a/chrome/browser/ui/gtk/process_singleton_dialog.cc
+++ b/chrome/browser/ui/gtk/process_singleton_dialog.cc
@@ -2,21 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/process_singleton_dialog.h"
+#include "chrome/browser/ui/process_singleton_dialog_linux.h"
 
 #include <gtk/gtk.h>
 
+#include <string>
+
+#include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
+#include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
 
-// static
-bool ProcessSingletonDialog::ShowAndRun(const std::string& message,
-                                        const std::string& relaunch_text) {
-  ProcessSingletonDialog dialog(message, relaunch_text);
-  return dialog.GetResponseId() == GTK_RESPONSE_ACCEPT;
-}
+namespace {
+
+class ProcessSingletonDialog {
+ public:
+  ProcessSingletonDialog(const std::string& message,
+                         const std::string& relaunch_text);
+
+  int GetResponseId() const { return response_id_; }
+
+ private:
+  CHROMEGTK_CALLBACK_1(ProcessSingletonDialog, void, OnResponse, int);
+
+  GtkWidget* dialog_;
+  int response_id_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProcessSingletonDialog);
+};
 
 ProcessSingletonDialog::ProcessSingletonDialog(
     const std::string& message,
@@ -48,3 +64,12 @@ void ProcessSingletonDialog::OnResponse(GtkWidget* dialog, int response_id) {
   gtk_widget_destroy(dialog_);
   base::MessageLoop::current()->Quit();
 }
+
+}  // namespace
+
+bool ShowProcessSingletonDialog(const string16& message,
+                                const string16& relaunch_text) {
+  ProcessSingletonDialog dialog(base::UTF16ToUTF8(message),
+                                base::UTF16ToUTF8(relaunch_text));
+  return dialog.GetResponseId() == GTK_RESPONSE_ACCEPT;
+}
diff --git a/chrome/browser/ui/gtk/process_singleton_dialog.h b/chrome/browser/ui/gtk/process_singleton_dialog.h
deleted file mode 100644
index 3bfb4b4..0000000
--- a/chrome/browser/ui/gtk/process_singleton_dialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_
-#define CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/files/file_path.h"
-#include "ui/base/gtk/gtk_signal.h"
-
-typedef struct _GtkWidget GtkWidget;
-
-// Displays an error to the user when the ProcessSingleton cannot acquire the
-// lock.  This runs the message loop itself as the browser message loop has not
-// started by that point in the startup process.
-class ProcessSingletonDialog {
- public:
-  // Shows the dialog, and returns once the dialog has been closed.
-  static bool ShowAndRun(const std::string& message,
-                         const std::string& relaunch_text);
-
-  int GetResponseId() const { return response_id_; }
-
- private:
-  ProcessSingletonDialog(const std::string& message,
-                         const std::string& relaunch_text);
-
-  CHROMEGTK_CALLBACK_1(ProcessSingletonDialog, void, OnResponse, int);
-
-  GtkWidget* dialog_;
-  int response_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessSingletonDialog);
-};
-
-#endif  // CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_