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

Side by Side Diff: ui/aura/mus/window_tree_client.cc

Issue 2754593003: Renames ui::mojom::Accelerator to ui::mojom::WmAccelerator (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
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/aura/mus/window_tree_client.h" 5 #include "ui/aura/mus/window_tree_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 } 1590 }
1591 } 1591 }
1592 1592
1593 void WindowTreeClient::SetNonClientCursor(Window* window, 1593 void WindowTreeClient::SetNonClientCursor(Window* window,
1594 ui::mojom::Cursor cursor_id) { 1594 ui::mojom::Cursor cursor_id) {
1595 window_manager_internal_client_->WmSetNonClientCursor( 1595 window_manager_internal_client_->WmSetNonClientCursor(
1596 WindowMus::Get(window)->server_id(), cursor_id); 1596 WindowMus::Get(window)->server_id(), cursor_id);
1597 } 1597 }
1598 1598
1599 void WindowTreeClient::AddAccelerators( 1599 void WindowTreeClient::AddAccelerators(
1600 std::vector<ui::mojom::AcceleratorPtr> accelerators, 1600 std::vector<ui::mojom::WmAcceleratorPtr> accelerators,
1601 const base::Callback<void(bool)>& callback) { 1601 const base::Callback<void(bool)>& callback) {
1602 if (window_manager_internal_client_) { 1602 if (window_manager_internal_client_) {
1603 window_manager_internal_client_->AddAccelerators(std::move(accelerators), 1603 window_manager_internal_client_->AddAccelerators(std::move(accelerators),
1604 callback); 1604 callback);
1605 } 1605 }
1606 } 1606 }
1607 1607
1608 void WindowTreeClient::RemoveAccelerator(uint32_t id) { 1608 void WindowTreeClient::RemoveAccelerator(uint32_t id) {
1609 if (window_manager_internal_client_) { 1609 if (window_manager_internal_client_) {
1610 window_manager_internal_client_->RemoveAccelerator(id); 1610 window_manager_internal_client_->RemoveAccelerator(id);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1849 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1849 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1850 this, capture_synchronizer_.get(), window)); 1850 this, capture_synchronizer_.get(), window));
1851 } 1851 }
1852 1852
1853 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1853 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1854 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1854 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1855 this, focus_synchronizer_.get(), window)); 1855 this, focus_synchronizer_.get(), window));
1856 } 1856 }
1857 1857
1858 } // namespace aura 1858 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698