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

Unified Diff: chrome/browser/chrome_content_browser_client.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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 680655b42d149b031ded4fc9f726f367c1bdccea..ec8722841b85987fd9267cc47a302036939b713d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -93,19 +93,15 @@
#endif
#if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chrome_browser_main_extra_parts_gtk.h"
+#include "chrome/browser/chrome_browser_parts_gtk.h"
#endif
#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/chrome_browser_main_extra_parts_views.h"
+#include "chrome/browser/chrome_browser_parts_views.h"
#endif
#if defined(USE_AURA)
-#include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
-#endif
-
-#if defined(TOUCH_UI)
-#include "chrome/browser/chrome_browser_main_extra_parts_touch.h"
+#include "chrome/browser/chrome_browser_parts_aura.h"
#endif
#if defined(OS_LINUX) || defined(OS_OPENBSD)
@@ -113,6 +109,10 @@
#include "chrome/browser/crash_handler_host_linux.h"
#endif
+#if defined(TOUCH_UI)
+#include "chrome/browser/chrome_browser_parts_touch.h"
+#endif
+
#if defined(TOOLKIT_VIEWS)
#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
#elif defined(TOOLKIT_USES_GTK)
@@ -219,44 +219,43 @@ RenderProcessHostPrivilege GetProcessPrivilege(
namespace chrome {
-content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
- const content::MainFunctionParams& parameters) {
- ChromeBrowserMainParts* main_parts;
+void ChromeContentBrowserClient::CreateBrowserMainParts(
+ const content::MainFunctionParams& parameters,
+ std::vector<content::BrowserMainParts*>* parts_list) {
// Construct the Main browser parts based on the OS type.
#if defined(OS_WIN)
- main_parts = new ChromeBrowserMainPartsWin(parameters);
+ parts_list->push_back(new ChromeBrowserMainPartsWin(parameters));
#elif defined(OS_MACOSX)
- main_parts = new ChromeBrowserMainPartsMac(parameters);
+ parts_list->push_back(new ChromeBrowserMainPartsMac(parameters));
#elif defined(OS_CHROMEOS)
- main_parts = new ChromeBrowserMainPartsChromeos(parameters);
+ parts_list->push_back(new ChromeBrowserMainPartsChromeos(parameters));
#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- main_parts = new ChromeBrowserMainPartsLinux(parameters);
+ parts_list->push_back(new ChromeBrowserMainPartsLinux(parameters));
#elif defined(OS_POSIX)
- main_parts = new ChromeBrowserMainPartsPosix(parameters);
+ parts_list->push_back(new ChromeBrowserMainPartsPosix(parameters));
#else
NOTREACHED();
- main_parts = new ChromeBrowserMainParts(parameters);
+ parts_list->push_back(new ChromeBrowserMainParts(parameters));
#endif
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_USES_GTK)
- main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk());
+ parts_list->push_back(new ChromeBrowserPartsGtk());
#endif
#if defined(TOOLKIT_VIEWS)
- main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
+ parts_list->push_back(new ChromeBrowserPartsViews());
#endif
#if defined(USE_AURA)
- main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
+ parts_list->push_back(new ChromeBrowserPartsAura());
#endif
#if defined(TOUCH_UI)
- main_parts->AddParts(new ChromeBrowserMainExtraPartsTouch());
+ parts_list->push_back(new ChromeBrowserPartsTouch());
#endif
- return main_parts;
}
RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698