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

Side by Side Diff: ui/views/test/test_views_delegate.h

Issue 10911074: Change how ui::Clipboard is accessed so there's only one per thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various windows compile failures. Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 5 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 10 matching lines...) Expand all
21 class Widget; 21 class Widget;
22 22
23 class TestViewsDelegate : public ViewsDelegate { 23 class TestViewsDelegate : public ViewsDelegate {
24 public: 24 public:
25 TestViewsDelegate(); 25 TestViewsDelegate();
26 virtual ~TestViewsDelegate(); 26 virtual ~TestViewsDelegate();
27 27
28 void SetUseTransparentWindows(bool transparent); 28 void SetUseTransparentWindows(bool transparent);
29 29
30 // Overridden from ViewsDelegate: 30 // Overridden from ViewsDelegate:
31 virtual ui::Clipboard* GetClipboard() const OVERRIDE;
32 virtual void SaveWindowPlacement(const Widget* window, 31 virtual void SaveWindowPlacement(const Widget* window,
33 const std::string& window_name, 32 const std::string& window_name,
34 const gfx::Rect& bounds, 33 const gfx::Rect& bounds,
35 ui::WindowShowState show_state) OVERRIDE; 34 ui::WindowShowState show_state) OVERRIDE;
36 virtual bool GetSavedWindowPlacement( 35 virtual bool GetSavedWindowPlacement(
37 const std::string& window_name, 36 const std::string& window_name,
38 gfx::Rect* bounds, 37 gfx::Rect* bounds,
39 ui::WindowShowState* show_state) const OVERRIDE; 38 ui::WindowShowState* show_state) const OVERRIDE;
40 39
41 virtual void NotifyAccessibilityEvent( 40 virtual void NotifyAccessibilityEvent(
(...skipping 20 matching lines...) Expand all
62 #if defined(USE_AURA) 61 #if defined(USE_AURA)
63 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper( 62 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
64 views::NativeWidgetAura* native_widget) OVERRIDE; 63 views::NativeWidgetAura* native_widget) OVERRIDE;
65 #endif 64 #endif
66 65
67 virtual content::WebContents* CreateWebContents( 66 virtual content::WebContents* CreateWebContents(
68 content::BrowserContext* browser_context, 67 content::BrowserContext* browser_context,
69 content::SiteInstance* site_instance) OVERRIDE; 68 content::SiteInstance* site_instance) OVERRIDE;
70 69
71 private: 70 private:
72 mutable scoped_ptr<ui::Clipboard> clipboard_;
73 bool use_transparent_windows_; 71 bool use_transparent_windows_;
74 72
75 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); 73 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
76 }; 74 };
77 75
78 } // namespace views 76 } // namespace views
79 77
80 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 78 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698