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

Side by Side Diff: services/ui/ws/window_manager_client_unittest.cc

Issue 2745143004: Inform window manager about modal windows in mus+ash. (Closed)
Patch Set: . 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void SetWindowManagerClient(aura::WindowManagerClient* client) override {} 47 void SetWindowManagerClient(aura::WindowManagerClient* client) override {}
48 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { 48 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override {
49 return false; 49 return false;
50 } 50 }
51 bool OnWmSetProperty( 51 bool OnWmSetProperty(
52 aura::Window* window, 52 aura::Window* window,
53 const std::string& name, 53 const std::string& name,
54 std::unique_ptr<std::vector<uint8_t>>* new_data) override { 54 std::unique_ptr<std::vector<uint8_t>>* new_data) override {
55 return false; 55 return false;
56 } 56 }
57 bool OnWmSetModalType(aura::Window* window, ui::ModalType type) override {
58 return false;
59 }
57 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {} 60 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override {}
58 aura::Window* OnWmCreateTopLevelWindow( 61 aura::Window* OnWmCreateTopLevelWindow(
59 ui::mojom::WindowType window_type, 62 ui::mojom::WindowType window_type,
60 std::map<std::string, std::vector<uint8_t>>* properties) override { 63 std::map<std::string, std::vector<uint8_t>>* properties) override {
61 return nullptr; 64 return nullptr;
62 } 65 }
63 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, 66 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows,
64 bool not_responding) override {} 67 bool not_responding) override {}
65 void OnWmWillCreateDisplay(const display::Display& display) override {} 68 void OnWmWillCreateDisplay(const display::Display& display) override {}
66 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 69 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 ASSERT_EQ(1u, top_level_in_wm->children().size()); 769 ASSERT_EQ(1u, top_level_in_wm->children().size());
767 aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0]; 770 aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0];
768 ASSERT_EQ(1u, second_client_child_in_wm->children().size()); 771 ASSERT_EQ(1u, second_client_child_in_wm->children().size());
769 aura::Window* transient_in_wm = second_client_child_in_wm->children()[0]; 772 aura::Window* transient_in_wm = second_client_child_in_wm->children()[0];
770 ASSERT_EQ(second_client_child_in_wm, 773 ASSERT_EQ(second_client_child_in_wm,
771 transient_window_client->GetTransientParent(transient_in_wm)); 774 transient_window_client->GetTransientParent(transient_in_wm));
772 } 775 }
773 776
774 } // namespace ws 777 } // namespace ws
775 } // namespace ui 778 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698