OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ | 5 #ifndef UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ |
6 #define UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ | 6 #define UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 13 matching lines...) Expand all Loading... | |
24 // static Desktop object. | 24 // static Desktop object. |
25 TestDesktopDelegate(); | 25 TestDesktopDelegate(); |
26 virtual ~TestDesktopDelegate(); | 26 virtual ~TestDesktopDelegate(); |
27 | 27 |
28 Window* default_container() { return default_container_.get(); } | 28 Window* default_container() { return default_container_.get(); } |
29 | 29 |
30 private: | 30 private: |
31 // Overridden from DesktopDelegate: | 31 // Overridden from DesktopDelegate: |
32 virtual void AddChildToDefaultParent(Window* window) OVERRIDE; | 32 virtual void AddChildToDefaultParent(Window* window) OVERRIDE; |
33 virtual Window* GetTopmostWindowToActivate(Window* ignore) const OVERRIDE; | 33 virtual Window* GetTopmostWindowToActivate(Window* ignore) const OVERRIDE; |
34 virtual DragDropController* GetDragDropController() const OVERRIDE { | |
Ben Goodger (Google)
2011/11/07 20:33:36
Can you move this to the .cc like the other method
varunjain
2011/11/08 21:59:35
Done.
| |
35 return NULL; | |
36 } | |
34 | 37 |
35 scoped_ptr<ToplevelWindowContainer> default_container_; | 38 scoped_ptr<ToplevelWindowContainer> default_container_; |
36 | 39 |
37 DISALLOW_COPY_AND_ASSIGN(TestDesktopDelegate); | 40 DISALLOW_COPY_AND_ASSIGN(TestDesktopDelegate); |
38 }; | 41 }; |
39 | 42 |
40 } // namespace test | 43 } // namespace test |
41 } // namespace aura | 44 } // namespace aura |
42 | 45 |
43 #endif // UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ | 46 #endif // UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_ |
OLD | NEW |