Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Side by Side Diff: trunk/src/chrome/browser/ui/gtk/process_singleton_dialog.h

Issue 23708026: Revert 222159 "Improve the UI for handling profile lock contention." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_
6 #define CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_ 6 #define CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/files/file_path.h"
12 #include "ui/base/gtk/gtk_signal.h" 11 #include "ui/base/gtk/gtk_signal.h"
13 12
14 typedef struct _GtkWidget GtkWidget; 13 typedef struct _GtkWidget GtkWidget;
15 14
16 // Displays an error to the user when the ProcessSingleton cannot acquire the 15 // Displays an error to the user when the ProcessSingleton cannot acquire the
17 // lock. This runs the message loop itself as the browser message loop has not 16 // lock. This runs the message loop itself as the browser message loop has not
18 // started by that point in the startup process. 17 // started by that point in the startup process.
19 class ProcessSingletonDialog { 18 class ProcessSingletonDialog {
20 public: 19 public:
21 // Shows the dialog, and returns once the dialog has been closed. 20 // Shows the dialog, and returns once the dialog has been closed.
22 static bool ShowAndRun(const std::string& message, 21 static void ShowAndRun(const std::string& message);
23 const std::string& relaunch_text);
24
25 int GetResponseId() const { return response_id_; }
26 22
27 private: 23 private:
28 ProcessSingletonDialog(const std::string& message, 24 explicit ProcessSingletonDialog(const std::string& message);
29 const std::string& relaunch_text);
30 25
31 CHROMEGTK_CALLBACK_1(ProcessSingletonDialog, void, OnResponse, int); 26 CHROMEGTK_CALLBACK_1(ProcessSingletonDialog, void, OnResponse, int);
32 27
33 GtkWidget* dialog_; 28 GtkWidget* dialog_;
34 int response_id_;
35 29
36 DISALLOW_COPY_AND_ASSIGN(ProcessSingletonDialog); 30 DISALLOW_COPY_AND_ASSIGN(ProcessSingletonDialog);
37 }; 31 };
38 32
39 #endif // CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_ 33 #endif // CHROME_BROWSER_UI_GTK_PROCESS_SINGLETON_DIALOG_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/process_singleton_linux.cc ('k') | trunk/src/chrome/browser/ui/gtk/process_singleton_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698