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

Side by Side Diff: chrome/browser/chrome_browser_main_extra_parts_exo.cc

Issue 2721153004: Remove ash_util namespace (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 5 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 8
9 #if defined(USE_GLIB) 9 #if defined(USE_GLIB)
10 #include <glib.h> 10 #include <glib.h>
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 ChromeBrowserMainExtraPartsExo::~ChromeBrowserMainExtraPartsExo() {} 118 ChromeBrowserMainExtraPartsExo::~ChromeBrowserMainExtraPartsExo() {}
119 119
120 void ChromeBrowserMainExtraPartsExo::PreProfileInit() { 120 void ChromeBrowserMainExtraPartsExo::PreProfileInit() {
121 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 121 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
122 switches::kEnableWaylandServer)) 122 switches::kEnableWaylandServer))
123 return; 123 return;
124 124
125 arc_notification_surface_manager_ = 125 arc_notification_surface_manager_ =
126 base::MakeUnique<arc::ArcNotificationSurfaceManager>(); 126 base::MakeUnique<arc::ArcNotificationSurfaceManager>();
127 if (ash_util::IsRunningInMash()) 127 if (IsRunningInMash())
128 wm_helper_ = base::MakeUnique<exo::WMHelperMus>(); 128 wm_helper_ = base::MakeUnique<exo::WMHelperMus>();
129 else 129 else
130 wm_helper_ = base::MakeUnique<exo::WMHelperAsh>(); 130 wm_helper_ = base::MakeUnique<exo::WMHelperAsh>();
131 exo::WMHelper::SetInstance(wm_helper_.get()); 131 exo::WMHelper::SetInstance(wm_helper_.get());
132 display_ = 132 display_ =
133 base::MakeUnique<exo::Display>(arc_notification_surface_manager_.get()); 133 base::MakeUnique<exo::Display>(arc_notification_surface_manager_.get());
134 wayland_server_ = exo::wayland::Server::Create(display_.get()); 134 wayland_server_ = exo::wayland::Server::Create(display_.get());
135 // Wayland server creation can fail if XDG_RUNTIME_DIR is not set correctly. 135 // Wayland server creation can fail if XDG_RUNTIME_DIR is not set correctly.
136 if (wayland_server_) 136 if (wayland_server_)
137 wayland_watcher_ = base::MakeUnique<WaylandWatcher>(wayland_server_.get()); 137 wayland_watcher_ = base::MakeUnique<WaylandWatcher>(wayland_server_.get());
138 } 138 }
139 139
140 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() { 140 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() {
141 wayland_watcher_.reset(); 141 wayland_watcher_.reset();
142 wayland_server_.reset(); 142 wayland_server_.reset();
143 if (wm_helper_) { 143 if (wm_helper_) {
144 exo::WMHelper::SetInstance(nullptr); 144 exo::WMHelper::SetInstance(nullptr);
145 wm_helper_.reset(); 145 wm_helper_.reset();
146 } 146 }
147 } 147 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/ui/ash/ash_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698