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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 | « ui/wm/test/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/aura/client/window_tree_client.h" 10 #include "ui/aura/client/window_tree_client.h"
(...skipping 29 matching lines...) Expand all
40 public: 40 public:
41 WMTestHelper(const gfx::Size& default_window_size, 41 WMTestHelper(const gfx::Size& default_window_size,
42 ui::ContextFactory* context_factory); 42 ui::ContextFactory* context_factory);
43 virtual ~WMTestHelper(); 43 virtual ~WMTestHelper();
44 44
45 aura::WindowTreeHost* host() { return host_.get(); } 45 aura::WindowTreeHost* host() { return host_.get(); }
46 46
47 // Overridden from client::WindowTreeClient: 47 // Overridden from client::WindowTreeClient:
48 virtual aura::Window* GetDefaultParent(aura::Window* context, 48 virtual aura::Window* GetDefaultParent(aura::Window* context,
49 aura::Window* window, 49 aura::Window* window,
50 const gfx::Rect& bounds) OVERRIDE; 50 const gfx::Rect& bounds) override;
51 51
52 private: 52 private:
53 scoped_ptr<aura::WindowTreeHost> host_; 53 scoped_ptr<aura::WindowTreeHost> host_;
54 54
55 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; 55 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
57 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_; 57 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
58 scoped_ptr<aura::client::FocusClient> focus_client_; 58 scoped_ptr<aura::client::FocusClient> focus_client_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); 60 DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
61 }; 61 };
62 62
63 } // namespace wm 63 } // namespace wm
64 64
65 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ 65 #endif // UI_WM_TEST_WM_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/wm/test/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698