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 f51ff1f0c387685e9f46d5822e8c92a27a7b4bd4..012d55ed8aff079d388e70e7285107afbf8521cc 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
 
@@ -676,7 +678,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());
+#elif defined(USE_ASH)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 #endif