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

Side by Side Diff: services/ui/test_wm/test_wm.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "mojo/public/cpp/bindings/binding.h" 10 #include "mojo/public/cpp/bindings/binding.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 100 }
101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { 101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override {
102 return true; 102 return true;
103 } 103 }
104 bool OnWmSetProperty( 104 bool OnWmSetProperty(
105 aura::Window* window, 105 aura::Window* window,
106 const std::string& name, 106 const std::string& name,
107 std::unique_ptr<std::vector<uint8_t>>* new_data) override { 107 std::unique_ptr<std::vector<uint8_t>>* new_data) override {
108 return true; 108 return true;
109 } 109 }
110 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override {}
110 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} 111 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {}
111 aura::Window* OnWmCreateTopLevelWindow( 112 aura::Window* OnWmCreateTopLevelWindow(
112 ui::mojom::WindowType window_type, 113 ui::mojom::WindowType window_type,
113 std::map<std::string, std::vector<uint8_t>>* properties) override { 114 std::map<std::string, std::vector<uint8_t>>* properties) override {
114 aura::Window* window = new aura::Window(nullptr); 115 aura::Window* window = new aura::Window(nullptr);
115 SetWindowType(window, window_type); 116 SetWindowType(window, window_type);
116 window->Init(LAYER_NOT_DRAWN); 117 window->Init(LAYER_NOT_DRAWN);
117 window->SetBounds(gfx::Rect(10, 10, 500, 500)); 118 window->SetBounds(gfx::Rect(10, 10, 500, 500));
118 root_->AddChild(window); 119 root_->AddChild(window);
119 return window; 120 return window;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 DISALLOW_COPY_AND_ASSIGN(TestWM); 190 DISALLOW_COPY_AND_ASSIGN(TestWM);
190 }; 191 };
191 192
192 } // namespace test 193 } // namespace test
193 } // namespace ui 194 } // namespace ui
194 195
195 MojoResult ServiceMain(MojoHandle service_request_handle) { 196 MojoResult ServiceMain(MojoHandle service_request_handle) {
196 service_manager::ServiceRunner runner(new ui::test::TestWM); 197 service_manager::ServiceRunner runner(new ui::test::TestWM);
197 return runner.Run(service_request_handle); 198 return runner.Run(service_request_handle);
198 } 199 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698