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

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

Issue 2759643003: Add system modals to the proper container in mus+ash. (Closed)
Patch Set: Remove extra code. 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 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 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 window->GetWindow(), name, data.get()); 1392 window->GetWindow(), name, data.get());
1393 } 1393 }
1394 } 1394 }
1395 if (window_manager_internal_client_) 1395 if (window_manager_internal_client_)
1396 window_manager_internal_client_->WmResponse(change_id, result); 1396 window_manager_internal_client_->WmResponse(change_id, result);
1397 } 1397 }
1398 1398
1399 void WindowTreeClient::WmSetModalType(Id window_id, ui::ModalType type) { 1399 void WindowTreeClient::WmSetModalType(Id window_id, ui::ModalType type) {
1400 WindowMus* window = GetWindowByServerId(window_id); 1400 WindowMus* window = GetWindowByServerId(window_id);
1401 if (window) 1401 if (window)
1402 window->GetWindow()->SetProperty(aura::client::kModalKey, type); 1402 window_manager_delegate_->OnWmSetModalType(window->GetWindow(), type);
1403 } 1403 }
1404 1404
1405 void WindowTreeClient::WmSetCanFocus(Id window_id, bool can_focus) { 1405 void WindowTreeClient::WmSetCanFocus(Id window_id, bool can_focus) {
1406 WindowMus* window = GetWindowByServerId(window_id); 1406 WindowMus* window = GetWindowByServerId(window_id);
1407 if (window) 1407 if (window)
1408 window_manager_delegate_->OnWmSetCanFocus(window->GetWindow(), can_focus); 1408 window_manager_delegate_->OnWmSetCanFocus(window->GetWindow(), can_focus);
1409 } 1409 }
1410 1410
1411 void WindowTreeClient::WmCreateTopLevelWindow( 1411 void WindowTreeClient::WmCreateTopLevelWindow(
1412 uint32_t change_id, 1412 uint32_t change_id,
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1829 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1829 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1830 this, capture_synchronizer_.get(), window)); 1830 this, capture_synchronizer_.get(), window));
1831 } 1831 }
1832 1832
1833 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1833 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1834 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1834 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1835 this, focus_synchronizer_.get(), window)); 1835 this, focus_synchronizer_.get(), window));
1836 } 1836 }
1837 1837
1838 } // namespace aura 1838 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698