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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 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/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index a94257d65a27056b8e790ea9ce84e7aa10c71a1f..e3a1f4b8a24225a30cde42b716f26911f2bea5ef 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -62,7 +62,7 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
if (ash_util::ShouldOpenAshOnStartup())
- chrome::OpenAsh(gfx::kNullAcceleratedWidget);
+ ash_init_ = base::MakeUnique<AshInit>();
if (ash_util::IsRunningInMash()) {
immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
@@ -119,5 +119,5 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
cast_config_client_media_router_.reset();
session_controller_client_.reset();
- chrome::CloseAsh();
+ ash_init_.reset();
}

Powered by Google App Engine
This is Rietveld 408576698