Run athena on chrome

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 175 matching lines @@
 #include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/signin_manager.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #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
 
 #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
@@ skipping 466 matching lines @@
 #endif
 
   chrome::AddProfilesExtraParts(main_parts);
 
   // Construct additional browser parts. Stages are called in the order in
   // which they are added.
 #if defined(TOOLKIT_VIEWS)
   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
 
 #if defined(USE_AURA)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
 #endif
 
 #if defined(USE_X11)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
 #endif
@@ skipping 1891 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome