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

Side by Side Diff: ui/wm/test/wm_test_helper.h

Issue 2762633003: Remove unused |context| from GetDefaultParent(). (Closed)
Patch Set: Fix chromecast compile error. 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_ 5 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_
6 #define UI_WM_TEST_WM_TEST_HELPER_H_ 6 #define UI_WM_TEST_WM_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 30 matching lines...) Expand all
41 // the ash parts of the code. 41 // the ash parts of the code.
42 class WMTestHelper : public aura::client::WindowParentingClient { 42 class WMTestHelper : public aura::client::WindowParentingClient {
43 public: 43 public:
44 WMTestHelper(const gfx::Size& default_window_size, 44 WMTestHelper(const gfx::Size& default_window_size,
45 ui::ContextFactory* context_factory); 45 ui::ContextFactory* context_factory);
46 ~WMTestHelper() override; 46 ~WMTestHelper() override;
47 47
48 aura::WindowTreeHost* host() { return host_.get(); } 48 aura::WindowTreeHost* host() { return host_.get(); }
49 49
50 // Overridden from client::WindowParentingClient: 50 // Overridden from client::WindowParentingClient:
51 aura::Window* GetDefaultParent(aura::Window* context, 51 aura::Window* GetDefaultParent(aura::Window* window,
52 aura::Window* window,
53 const gfx::Rect& bounds) override; 52 const gfx::Rect& bounds) override;
54 53
55 private: 54 private:
56 std::unique_ptr<WMState> wm_state_; 55 std::unique_ptr<WMState> wm_state_;
57 std::unique_ptr<aura::WindowTreeHost> host_; 56 std::unique_ptr<aura::WindowTreeHost> host_;
58 std::unique_ptr<aura::InputMethodGlue> input_method_glue_; 57 std::unique_ptr<aura::InputMethodGlue> input_method_glue_;
59 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; 58 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_;
60 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; 59 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
61 std::unique_ptr<aura::client::FocusClient> focus_client_; 60 std::unique_ptr<aura::client::FocusClient> focus_client_;
62 61
63 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); 62 DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
64 }; 63 };
65 64
66 } // namespace wm 65 } // namespace wm
67 66
68 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ 67 #endif // UI_WM_TEST_WM_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/wm/test/wm_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698