diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 18:00:51 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 18:00:51 +0000 |
| commit | e8b6ca09daa38e93c9f613c99a90e295ed3511ae (patch) | |
| tree | 928c23584998f720ce1639b822e3c5622b7e8c37 /chrome/browser/chrome_content_browser_client.cc | |
| parent | f5f534be197fb1cfa2fb0e719e38a8cdb18a6c41 (diff) | |
| download | chromium_src-e8b6ca09daa38e93c9f613c99a90e295ed3511ae.zip chromium_src-e8b6ca09daa38e93c9f613c99a90e295ed3511ae.tar.gz chromium_src-e8b6ca09daa38e93c9f613c99a90e295ed3511ae.tar.bz2 | |
Small cleanup for ChromeBrowserMain:
-add ChromeBrowserMainExtraPartsX11 to get rid of the x11 specific calls in ChromeBrowserMain that are right beside ChromeBrowserMainExtraParts calls
-move win specific stuff out of ChromeBrowserMain and into ChromeBrowserMainWin
-remove the static methods in chrome_browser_main.h in favor of private methods in chrome_browser_main.h
-remove the unnecessary toolkit_extra_parts.h header, it doesn't help much since each method was named differently anyways
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/18967002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 5c2c6d0..5778dd9 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -80,7 +80,6 @@ #include "chrome/browser/ssl/ssl_blocking_page.h" #include "chrome/browser/ssl/ssl_tab_helper.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/toolkit_extra_parts.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" @@ -203,6 +202,26 @@ #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" #endif +#if defined(TOOLKIT_GTK) +#include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" +#endif + +#if defined(TOOLKIT_VIEWS) +#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" +#endif + +#if defined(USE_ASH) +#include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" +#endif + +#if defined(USE_AURA) +#include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" +#endif + +#if defined(USE_X11) +#include "chrome/browser/chrome_browser_main_extra_parts_x11.h" +#endif + using base::FileDescriptor; using content::AccessTokenStore; using content::BrowserChildProcessHostIterator; @@ -574,19 +593,23 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_GTK) - chrome::AddGtkToolkitExtraParts(main_parts); + main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk()); #endif #if defined(TOOLKIT_VIEWS) - chrome::AddViewsToolkitExtraParts(main_parts); + main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); #endif #if defined(USE_ASH) - chrome::AddAshToolkitExtraParts(main_parts); + main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); #endif #if defined(USE_AURA) - chrome::AddAuraToolkitExtraParts(main_parts); + main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); +#endif + +#if defined(USE_X11) + main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); #endif chrome::AddMetricsExtraParts(main_parts); |