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

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: addressed feedback. 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_manager_delegate.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 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 window->GetWindow(), name, data.get()); 1427 window->GetWindow(), name, data.get());
1428 } 1428 }
1429 } 1429 }
1430 if (window_manager_internal_client_) 1430 if (window_manager_internal_client_)
1431 window_manager_internal_client_->WmResponse(change_id, result); 1431 window_manager_internal_client_->WmResponse(change_id, result);
1432 } 1432 }
1433 1433
1434 void WindowTreeClient::WmSetModalType(Id window_id, ui::ModalType type) { 1434 void WindowTreeClient::WmSetModalType(Id window_id, ui::ModalType type) {
1435 WindowMus* window = GetWindowByServerId(window_id); 1435 WindowMus* window = GetWindowByServerId(window_id);
1436 if (window) 1436 if (window)
1437 window->GetWindow()->SetProperty(aura::client::kModalKey, type); 1437 window_manager_delegate_->OnWmSetModalType(window->GetWindow(), type);
1438 } 1438 }
1439 1439
1440 void WindowTreeClient::WmSetCanFocus(Id window_id, bool can_focus) { 1440 void WindowTreeClient::WmSetCanFocus(Id window_id, bool can_focus) {
1441 WindowMus* window = GetWindowByServerId(window_id); 1441 WindowMus* window = GetWindowByServerId(window_id);
1442 if (window) 1442 if (window)
1443 window_manager_delegate_->OnWmSetCanFocus(window->GetWindow(), can_focus); 1443 window_manager_delegate_->OnWmSetCanFocus(window->GetWindow(), can_focus);
1444 } 1444 }
1445 1445
1446 void WindowTreeClient::WmCreateTopLevelWindow( 1446 void WindowTreeClient::WmCreateTopLevelWindow(
1447 uint32_t change_id, 1447 uint32_t change_id,
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1864 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>( 1864 return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
1865 this, capture_synchronizer_.get(), window)); 1865 this, capture_synchronizer_.get(), window));
1866 } 1866 }
1867 1867
1868 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) { 1868 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
1869 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>( 1869 return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
1870 this, focus_synchronizer_.get(), window)); 1870 this, focus_synchronizer_.get(), window));
1871 } 1871 }
1872 1872
1873 } // namespace aura 1873 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698