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

Unified Diff: chrome/browser/chrome_browser_parts_gtk.cc

Issue 8596015: Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_parts_gtk.h ('k') | chrome/browser/chrome_browser_parts_touch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_parts_gtk.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_gtk.cc b/chrome/browser/chrome_browser_parts_gtk.cc
similarity index 75%
rename from chrome/browser/chrome_browser_main_extra_parts_gtk.cc
rename to chrome/browser/chrome_browser_parts_gtk.cc
index 406d3ec7c95ad498abff29643b1792eaf24dcf55..3d1a5aaeab8e2ed80dfd093259c9efedbc532a83 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_gtk.cc
+++ b/chrome/browser/chrome_browser_parts_gtk.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chrome_browser_main_extra_parts_gtk.h"
+#include "chrome/browser/chrome_browser_parts_gtk.h"
#include <gtk/gtk.h>
@@ -14,16 +14,37 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/gtk_util.h"
-ChromeBrowserMainExtraPartsGtk::ChromeBrowserMainExtraPartsGtk()
- : ChromeBrowserMainExtraParts() {
+ChromeBrowserPartsGtk::ChromeBrowserPartsGtk()
+ : content::BrowserMainParts() {
}
-void ChromeBrowserMainExtraPartsGtk::PreEarlyInitialization() {
+void ChromeBrowserPartsGtk::PreEarlyInitialization() {
DetectRunningAsRoot();
}
+void ChromeBrowserPartsGtk::PostEarlyInitialization() {
+}
+
+void ChromeBrowserPartsGtk::ToolkitInitialized() {
+}
+
+void ChromeBrowserPartsGtk::PreMainMessageLoopStart() {
+}
+
+void ChromeBrowserPartsGtk::PostMainMessageLoopStart() {
+}
+
+void ChromeBrowserPartsGtk::PreMainMessageLoopRun() {
+}
+
+bool ChromeBrowserPartsGtk::MainMessageLoopRun(int* result_code) {
+ return false;
+}
+
+void ChromeBrowserPartsGtk::PostMainMessageLoopRun() {
+}
-void ChromeBrowserMainExtraPartsGtk::DetectRunningAsRoot() {
+void ChromeBrowserPartsGtk::DetectRunningAsRoot() {
if (geteuid() == 0) {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kUserDataDir))
@@ -65,7 +86,7 @@ void ChromeBrowserMainExtraPartsGtk::DetectRunningAsRoot() {
}
// static
-void ChromeBrowserMainExtraPartsGtk::ShowMessageBox(const char* message) {
+void ChromeBrowserPartsGtk::ShowMessageBox(const char* message) {
GtkWidget* dialog = gtk_message_dialog_new(
NULL,
static_cast<GtkDialogFlags>(0),
« no previous file with comments | « chrome/browser/chrome_browser_parts_gtk.h ('k') | chrome/browser/chrome_browser_parts_touch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698