Chromium Code Reviews| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| index 3c83155e850f71a8c00651e1626824339a8617eb..ada0af8a22b099fd5b8098b896504c596e1da9d3 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -147,6 +147,10 @@ |
| #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h" |
| #endif |
| +#if defined(USE_ASH) |
| +#include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| +#endif |
| + |
| namespace chromeos { |
| namespace { |
| @@ -638,6 +642,18 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| // available. |
| idle_action_warning_observer_.reset(new IdleActionWarningObserver()); |
| + // TODO(yoshiki): Make the ArcNotificationManager instance managed by |
| + // ArcServiceManager, when it can manage a service under C/B/chromeos |
|
elijahtaylor1
2015/12/16 02:34:37
seems this comment is out of date now?
Luis Héctor Chávez
2015/12/17 17:43:09
components/arc cannot have any dependency to chrom
yoshiki
2015/12/17 19:15:13
Yes, removed.
|
| + // (crbug.com/569562). |
| + if (arc::ArcBridgeService::GetEnabled( |
| + base::CommandLine::ForCurrentProcess())) { |
| + DCHECK(arc_service_manager_); |
| +#if defined(USE_ASH) |
|
Luis Héctor Chávez
2015/12/17 17:43:09
Why not gate the whole chunk with USE_ASH instead
yoshiki
2015/12/17 19:15:13
multi_user_util.[h|cc] is in ash/ directory so I t
|
| + arc_service_manager_->PostProfileInit( |
| + multi_user_util::GetAccountIdFromProfile(profile())); |
| +#endif // defined(USE_ASH) |
| + } |
| + |
| ChromeBrowserMainPartsLinux::PostProfileInit(); |
| } |