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

Side by Side Diff: services/ui/demo/mus_demo_internal.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 | « services/ui/demo/mus_demo_internal.h ('k') | services/ui/test_wm/test_wm.cc » ('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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "services/ui/demo/mus_demo_internal.h" 5 #include "services/ui/demo/mus_demo_internal.h"
6 6
7 #include "services/service_manager/public/cpp/service_context.h" 7 #include "services/service_manager/public/cpp/service_context.h"
8 #include "services/ui/demo/window_tree_data.h" 8 #include "services/ui/demo/window_tree_data.h"
9 #include "ui/aura/mus/window_tree_client.h" 9 #include "ui/aura/mus/window_tree_client.h"
10 #include "ui/aura/mus/window_tree_host_mus.h" 10 #include "ui/aura/mus/window_tree_host_mus.h"
(...skipping 30 matching lines...) Expand all
41 return true; 41 return true;
42 } 42 }
43 43
44 bool MusDemoInternal::OnWmSetProperty( 44 bool MusDemoInternal::OnWmSetProperty(
45 aura::Window* window, 45 aura::Window* window,
46 const std::string& name, 46 const std::string& name,
47 std::unique_ptr<std::vector<uint8_t>>* new_data) { 47 std::unique_ptr<std::vector<uint8_t>>* new_data) {
48 return true; 48 return true;
49 } 49 }
50 50
51 void MusDemoInternal::OnWmSetModalType(aura::Window* window, ModalType type) {}
52
51 void MusDemoInternal::OnWmSetCanFocus(aura::Window* window, bool can_focus) {} 53 void MusDemoInternal::OnWmSetCanFocus(aura::Window* window, bool can_focus) {}
52 54
53 aura::Window* MusDemoInternal::OnWmCreateTopLevelWindow( 55 aura::Window* MusDemoInternal::OnWmCreateTopLevelWindow(
54 mojom::WindowType window_type, 56 mojom::WindowType window_type,
55 std::map<std::string, std::vector<uint8_t>>* properties) { 57 std::map<std::string, std::vector<uint8_t>>* properties) {
56 NOTREACHED(); 58 NOTREACHED();
57 return nullptr; 59 return nullptr;
58 } 60 }
59 61
60 void MusDemoInternal::OnWmClientJankinessChanged( 62 void MusDemoInternal::OnWmClientJankinessChanged(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 const std::vector<gfx::Rect>& additional_client_areas) {} 104 const std::vector<gfx::Rect>& additional_client_areas) {}
103 105
104 bool MusDemoInternal::IsWindowActive(aura::Window* window) { 106 bool MusDemoInternal::IsWindowActive(aura::Window* window) {
105 return false; 107 return false;
106 } 108 }
107 109
108 void MusDemoInternal::OnWmDeactivateWindow(aura::Window* window) {} 110 void MusDemoInternal::OnWmDeactivateWindow(aura::Window* window) {}
109 111
110 } // namespace demo 112 } // namespace demo
111 } // namespace ui 113 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/demo/mus_demo_internal.h ('k') | services/ui/test_wm/test_wm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698