Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chrome_browser_main_gtk.cc

Index: chrome/browser/chrome_browser_main_gtk.cc
diff --git a/chrome/browser/chrome_browser_main_gtk.cc b/chrome/browser/chrome_browser_main_gtk.cc
index abf3f7abcb1f602c7baa55b02d53a1eea006680e..7564b7a5eb3026fe906baaece5ce2b1a90097e4d 100644
--- a/chrome/browser/chrome_browser_main_gtk.cc
+++ b/chrome/browser/chrome_browser_main_gtk.cc
@@ -14,21 +14,18 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 
-ChromeBrowserMainPartsGtk::ChromeBrowserMainPartsGtk(
-    const MainFunctionParams& parameters)
-    : ChromeBrowserMainPartsPosix(parameters) {
+ChromeBrowserPartsGtk::ChromeBrowserPartsGtk(ChromeBrowserMainParts* main_parts)
+ : ChromeBrowserMainParts::ExtraParts(main_parts) {
 }
 
-void ChromeBrowserMainPartsGtk::PreEarlyInitialization() {
+void ChromeBrowserPartsGtk::PreEarlyInitialization() {
   DetectRunningAsRoot();
-
-  ChromeBrowserMainPartsPosix::PreEarlyInitialization();
 }
 
-void ChromeBrowserMainPartsGtk::DetectRunningAsRoot() {
+void ChromeBrowserPartsGtk::DetectRunningAsRoot() {
   if (geteuid() == 0) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (parsed_command_line().HasSwitch(switches::kUserDataDir))
+    if (main_parts()->parsed_command_line().HasSwitch(switches::kUserDataDir))
       return;
 
     gfx::GtkInitFromCommandLine(command_line);
@@ -66,18 +63,17 @@ void ChromeBrowserMainPartsGtk::DetectRunningAsRoot() {
   }
 }
 
-void ShowMissingLocaleMessageBox() {
+// static
+void ChromeBrowserPartsGtk::ShowMessageBox(const char* message) {
   GtkWidget* dialog = gtk_message_dialog_new(
       NULL,
       static_cast<GtkDialogFlags>(0),
       GTK_MESSAGE_ERROR,
       GTK_BUTTONS_CLOSE,
       "%s",
-      chrome_browser::kMissingLocaleDataMessage);
-
-  gtk_window_set_title(GTK_WINDOW(dialog),
-                       chrome_browser::kMissingLocaleDataTitle);
+      message);
 
+  gtk_window_set_title(GTK_WINDOW(dialog), message);
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
 }