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

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

Issue 780913002: Revert of Fix icon on Windows XP taskbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/gfx/win/window_impl.cc ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/views/views_delegate.h" 9 #include "ui/views/views_delegate.h"
10 10
(...skipping 18 matching lines...) Expand all
29 void set_use_transparent_windows(bool transparent) { 29 void set_use_transparent_windows(bool transparent) {
30 use_transparent_windows_ = transparent; 30 use_transparent_windows_ = transparent;
31 } 31 }
32 32
33 // Allows tests to provide a ContextFactory via the ViewsDelegate interface. 33 // Allows tests to provide a ContextFactory via the ViewsDelegate interface.
34 void set_context_factory(ui::ContextFactory* context_factory) { 34 void set_context_factory(ui::ContextFactory* context_factory) {
35 context_factory_ = context_factory; 35 context_factory_ = context_factory;
36 } 36 }
37 37
38 // ViewsDelegate: 38 // ViewsDelegate:
39 #if defined(OS_WIN)
40 HICON GetSmallWindowIcon() const override { return nullptr; }
41 #endif
42 void OnBeforeWidgetInit(Widget::InitParams* params, 39 void OnBeforeWidgetInit(Widget::InitParams* params,
43 internal::NativeWidgetDelegate* delegate) override; 40 internal::NativeWidgetDelegate* delegate) override;
44 ui::ContextFactory* GetContextFactory() override; 41 ui::ContextFactory* GetContextFactory() override;
45 42
46 private: 43 private:
47 ui::ContextFactory* context_factory_; 44 ui::ContextFactory* context_factory_;
48 bool use_desktop_native_widgets_; 45 bool use_desktop_native_widgets_;
49 bool use_transparent_windows_; 46 bool use_transparent_windows_;
50 47
51 #if defined(USE_AURA) 48 #if defined(USE_AURA)
52 scoped_ptr<wm::WMState> wm_state_; 49 scoped_ptr<wm::WMState> wm_state_;
53 #endif 50 #endif
54 51
55 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); 52 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
56 }; 53 };
57 54
58 } // namespace views 55 } // namespace views
59 56
60 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ 57 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/gfx/win/window_impl.cc ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698