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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9701002: Aura/ash split: Split the extra parts into ash and aura parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk to try again Created 8 years, 9 months 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 cd487862f4c596f7cf724dcea2860ef8fa3ff2a3..afae4d8b88a57f06b4e58c063d6f2362bb89d59b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -119,6 +119,10 @@
#include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
#endif
+#if defined(USE_ASH)
+#include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
+#endif
+
#if defined(OS_LINUX) || defined(OS_OPENBSD)
#include "base/linux_util.h"
#include "chrome/browser/crash_handler_host_linux.h"
@@ -339,6 +343,10 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
#endif
+#if defined(USE_ASH)
+ main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
+#endif
+
return main_parts;
}
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/browser/extensions/extension_tabs_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698