Run athena on chrome

chrome/browser/chrome_content_browser_client.cc

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 c17c38061a2d28eb7a8b76e6fe9b460827c1d090..9bb714cf61c00453eebf93b35bb7f9adccf66cb5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -193,7 +193,9 @@
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
 
-#if defined(USE_ASH)
+#if defined(USE_ATHENA)
+#include "chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h"
+#elif defined(USE_ASH)
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 #endif
 
@@ -680,7 +682,11 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
 #endif
 
-#if defined(USE_ASH)
+// TODO(oshima): Athena on chrome currently requires USE_ASH to build.
+// We should reduce the dependency as much as possible.
+#if defined(USE_ATHENA)
+  main_parts->AddParts(CreateChromeBrowserMainExtraPartsAthena());

[Mr4D (OOO till 08-26), 2014/08/29 00:09:58]

I leave this to you, but every other function uses new .. and you have created
this CreateChromeBrowser.. function. Would be nice to be uniform within the
module.

[oshima, 2014/08/29 00:44:43]

I'm going to just follow the OWNERS recommendation. I did this way because
exposing class definition is technically unnecessary, and we're actually doing
the same thing if it's method ( in class A { B* Create(); }, we only uses
forward decl), but I'm fine with other way.

+#elif defined(USE_ASH)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 #endif