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

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

Issue 2230723003: mash: Show status area widget, attempt 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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_shelf_mus.cc ('k') | ash/mus/root_window_controller.h » ('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 <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/display/display_info.h" 10 #include "ash/common/display/display_info.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here. 361 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
362 NOTIMPLEMENTED(); 362 NOTIMPLEMENTED();
363 } 363 }
364 364
365 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { 365 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
366 NOTIMPLEMENTED(); 366 NOTIMPLEMENTED();
367 } 367 }
368 368
369 bool WmShellMus::IsTouchDown() { 369 bool WmShellMus::IsTouchDown() {
370 // TODO: implement me, http://crbug.com/634967. 370 // TODO: implement me, http://crbug.com/634967.
371 NOTIMPLEMENTED(); 371 // NOTIMPLEMENTED is too spammy here.
372 return false; 372 return false;
373 } 373 }
374 374
375 #if defined(OS_CHROMEOS) 375 #if defined(OS_CHROMEOS)
376 void WmShellMus::ToggleIgnoreExternalKeyboard() { 376 void WmShellMus::ToggleIgnoreExternalKeyboard() {
377 NOTIMPLEMENTED(); 377 NOTIMPLEMENTED();
378 } 378 }
379 #endif // defined(OS_CHROMEOS) 379 #endif // defined(OS_CHROMEOS)
380 380
381 ui::WindowTreeClient* WmShellMus::window_tree_client() { 381 ui::WindowTreeClient* WmShellMus::window_tree_client() {
(...skipping 21 matching lines...) Expand all
403 OnWindowActivated(gained_active, lost_active)); 403 OnWindowActivated(gained_active, lost_active));
404 } 404 }
405 405
406 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 406 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
407 DCHECK_EQ(window_tree_client(), client); 407 DCHECK_EQ(window_tree_client(), client);
408 client->RemoveObserver(this); 408 client->RemoveObserver(this);
409 } 409 }
410 410
411 } // namespace mus 411 } // namespace mus
412 } // namespace ash 412 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698