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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include "ash/common/default_accessibility_delegate.h" 7 #include "ash/common/default_accessibility_delegate.h"
8 #include "ash/common/display/display_info.h"
8 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shell_observer.h" 10 #include "ash/common/shell_observer.h"
10 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/system/tray/default_system_tray_delegate.h" 12 #include "ash/common/system/tray/default_system_tray_delegate.h"
12 #include "ash/common/wm/mru_window_tracker.h" 13 #include "ash/common/wm/mru_window_tracker.h"
13 #include "ash/common/wm/window_resizer.h" 14 #include "ash/common/wm/window_resizer.h"
14 #include "ash/common/wm_activation_observer.h" 15 #include "ash/common/wm_activation_observer.h"
15 #include "ash/common/wm_shell_common.h" 16 #include "ash/common/wm_shell_common.h"
16 #include "ash/mus/bridge/wm_root_window_controller_mus.h" 17 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
17 #include "ash/mus/bridge/wm_window_mus.h" 18 #include "ash/mus/bridge/wm_window_mus.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 171
171 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) { 172 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
172 return GetRootWindowControllerWithDisplayId(display_id)->GetWindow(); 173 return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
173 } 174 }
174 175
175 WmWindow* WmShellMus::GetRootWindowForNewWindows() { 176 WmWindow* WmShellMus::GetRootWindowForNewWindows() {
176 NOTIMPLEMENTED(); 177 NOTIMPLEMENTED();
177 return root_window_controllers_[0]->GetWindow(); 178 return root_window_controllers_[0]->GetWindow();
178 } 179 }
179 180
181 const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const {
182 NOTIMPLEMENTED();
183 static DisplayInfo fake_info;
184 return fake_info;
185 }
186
180 bool WmShellMus::IsForceMaximizeOnFirstRun() { 187 bool WmShellMus::IsForceMaximizeOnFirstRun() {
181 NOTIMPLEMENTED(); 188 NOTIMPLEMENTED();
182 return false; 189 return false;
183 } 190 }
184 191
185 bool WmShellMus::IsPinned() { 192 bool WmShellMus::IsPinned() {
186 NOTIMPLEMENTED(); 193 NOTIMPLEMENTED();
187 return false; 194 return false;
188 } 195 }
189 196
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 OnWindowActivated(gained_active, lost_active)); 322 OnWindowActivated(gained_active, lost_active));
316 } 323 }
317 324
318 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) { 325 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
319 DCHECK_EQ(client, client_); 326 DCHECK_EQ(client, client_);
320 RemoveClientObserver(); 327 RemoveClientObserver();
321 } 328 }
322 329
323 } // namespace mus 330 } // namespace mus
324 } // namespace ash 331 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698