Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.

chrome/browser/chrome_browser_parts_views.cc

Index: chrome/browser/chrome_browser_parts_views.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_views.cc b/chrome/browser/chrome_browser_parts_views.cc
similarity index 85%
rename from chrome/browser/chrome_browser_main_extra_parts_views.cc
rename to chrome/browser/chrome_browser_parts_views.cc
index 78087d1cc13cc9e21fef5e16349526d199cd40c6..31911082602f37635f19b1814e7cbd79885d8e8b 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/chrome_browser_parts_views.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_views.h"
+#include "chrome/browser/chrome_browser_parts_views.h"
 
 #include <string>
 
@@ -12,11 +12,11 @@
 #include "ui/views/desktop/desktop_window_view.h"
 #include "views/widget/widget.h"
 
-ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews()
-    : ChromeBrowserMainExtraParts() {
+ChromeBrowserPartsViews::ChromeBrowserPartsViews()
+    : content::BrowserMainParts() {
 }
 
-void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
+void ChromeBrowserPartsViews::ToolkitInitialized() {
   // The delegate needs to be set before any UI is created so that windows
   // display the correct icon.
   if (!views::ViewsDelegate::views_delegate)
@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
     views::Widget::SetDebugPaintEnabled(true);
 }
 
-void ChromeBrowserMainExtraPartsViews::PostBrowserProcessInit() {
+void ChromeBrowserPartsViews::PreMainMessageLoopRun() {
 #if !defined(USE_AURA)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
@@ -54,3 +54,7 @@ void ChromeBrowserMainExtraPartsViews::PostBrowserProcessInit() {
   }
 #endif
 }
+
+bool ChromeBrowserPartsViews::MainMessageLoopRun(int* result_code) {
+  return false;
+}