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

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

Issue 2650833002: Set focusibility correctly when initializing a window in mus+ash. (Closed)
Patch Set: addressed feedback. Created 3 years, 10 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') | ui/aura/test/aura_test_base.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 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 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 name, &data); 1415 name, &data);
1416 if (result) { 1416 if (result) {
1417 delegate_->GetPropertyConverter()->SetPropertyFromTransportValue( 1417 delegate_->GetPropertyConverter()->SetPropertyFromTransportValue(
1418 window->GetWindow(), name, data.get()); 1418 window->GetWindow(), name, data.get());
1419 } 1419 }
1420 } 1420 }
1421 if (window_manager_internal_client_) 1421 if (window_manager_internal_client_)
1422 window_manager_internal_client_->WmResponse(change_id, result); 1422 window_manager_internal_client_->WmResponse(change_id, result);
1423 } 1423 }
1424 1424
1425 void WindowTreeClient::WmSetCanFocus(Id window_id, bool can_focus) {
1426 WindowMus* window = GetWindowByServerId(window_id);
1427 if (window)
1428 window_manager_delegate_->OnWmSetCanFocus(window->GetWindow(), can_focus);
1429 }
1430
1425 void WindowTreeClient::WmCreateTopLevelWindow( 1431 void WindowTreeClient::WmCreateTopLevelWindow(
1426 uint32_t change_id, 1432 uint32_t change_id,
1427 ClientSpecificId requesting_client_id, 1433 ClientSpecificId requesting_client_id,
1428 const std::unordered_map<std::string, std::vector<uint8_t>>& 1434 const std::unordered_map<std::string, std::vector<uint8_t>>&
1429 transport_properties) { 1435 transport_properties) {
1430 std::map<std::string, std::vector<uint8_t>> properties = 1436 std::map<std::string, std::vector<uint8_t>> properties =
1431 mojo::UnorderedMapToMap(transport_properties); 1437 mojo::UnorderedMapToMap(transport_properties);
1432 ui::mojom::WindowType window_type = ui::mojom::WindowType::UNKNOWN; 1438 ui::mojom::WindowType window_type = ui::mojom::WindowType::UNKNOWN;
1433 auto type_iter = 1439 auto type_iter =
1434 properties.find(ui::mojom::WindowManager::kWindowType_InitProperty); 1440 properties.find(ui::mojom::WindowManager::kWindowType_InitProperty);
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1776 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1771 this, capture_synchronizer_.get(), window)); 1777 this, capture_synchronizer_.get(), window));
1772 } 1778 }
1773 1779
1774 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1780 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1775 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1781 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1776 this, focus_synchronizer_.get(), window)); 1782 this, focus_synchronizer_.get(), window));
1777 } 1783 }
1778 1784
1779 } // namespace aura 1785 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698