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

Side by Side Diff: components/mus/ws/window_manager_client_apptest.cc

Issue 1656123002: Moves accelerator registration to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mandoline Created 4 years, 10 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 bool OnWmSetProperty(Window* window, 46 bool OnWmSetProperty(Window* window,
47 const std::string& name, 47 const std::string& name,
48 scoped_ptr<std::vector<uint8_t>>* new_data) override { 48 scoped_ptr<std::vector<uint8_t>>* new_data) override {
49 return true; 49 return true;
50 } 50 }
51 Window* OnWmCreateTopLevelWindow( 51 Window* OnWmCreateTopLevelWindow(
52 std::map<std::string, std::vector<uint8_t>>* properties) override { 52 std::map<std::string, std::vector<uint8_t>>* properties) override {
53 return nullptr; 53 return nullptr;
54 } 54 }
55 void OnAccelerator(uint32_t id, mojom::EventPtr event) override {}
55 56
56 private: 57 private:
57 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); 58 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate);
58 }; 59 };
59 60
60 class BoundsChangeObserver : public WindowObserver { 61 class BoundsChangeObserver : public WindowObserver {
61 public: 62 public:
62 explicit BoundsChangeObserver(Window* window) : window_(window) { 63 explicit BoundsChangeObserver(Window* window) : window_(window) {
63 window_->AddObserver(this); 64 window_->AddObserver(this);
64 } 65 }
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 ASSERT_TRUE(window_in_wm); 1166 ASSERT_TRUE(window_in_wm);
1166 1167
1167 // Change the bounds in the wm, and make sure the child sees it. 1168 // Change the bounds in the wm, and make sure the child sees it.
1168 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); 1169 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
1169 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); 1170 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
1170 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); 1171 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
1171 } 1172 }
1172 1173
1173 } // namespace ws 1174 } // namespace ws
1174 } // namespace mus 1175 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/public/interfaces/window_tree_host.mojom ('k') | components/mus/ws/window_tree_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698