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

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.h

Issue 11299074: Make use_aura set use_default_render_theme and moves (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge 2 trunk and update some ifdefs Created 8 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 | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webthemeengine_impl_default.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 WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 5 #ifndef WEBKIT_PLATFORM_SUPPORT_IMPL_H_
6 #define WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 6 #define WEBKIT_PLATFORM_SUPPORT_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/threading/thread_local_storage.h" 10 #include "base/threading/thread_local_storage.h"
11 #include "base/timer.h" 11 #include "base/timer.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h"
13 #include "ui/base/layout.h" 13 #include "ui/base/layout.h"
14 #include "webkit/glue/resource_loader_bridge.h" 14 #include "webkit/glue/resource_loader_bridge.h"
15 #include "webkit/glue/webkit_glue_export.h" 15 #include "webkit/glue/webkit_glue_export.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(USE_DEFAULT_RENDER_THEME)
18 #include "webkit/glue/webthemeengine_impl_default.h"
19 #elif defined(OS_WIN)
18 #include "webkit/glue/webthemeengine_impl_win.h" 20 #include "webkit/glue/webthemeengine_impl_win.h"
19 #elif defined(OS_MACOSX) 21 #elif defined(OS_MACOSX)
20 #include "webkit/glue/webthemeengine_impl_mac.h" 22 #include "webkit/glue/webthemeengine_impl_mac.h"
21 #elif defined(OS_ANDROID) 23 #elif defined(OS_ANDROID)
22 #include "webkit/glue/webthemeengine_impl_android.h" 24 #include "webkit/glue/webthemeengine_impl_android.h"
23 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
24 #include "webkit/glue/webthemeengine_impl_linux.h"
25 #endif 25 #endif
26 26
27
28 class MessageLoop; 27 class MessageLoop;
29 28
30 namespace webkit { 29 namespace webkit {
31 class WebCompositorSupportImpl; 30 class WebCompositorSupportImpl;
32 struct WebPluginInfo; 31 struct WebPluginInfo;
33 } 32 }
34 33
35 namespace WebKit { 34 namespace WebKit {
36 class WebFlingAnimator; 35 class WebFlingAnimator;
37 class WebSocketStreamHandle; 36 class WebSocketStreamHandle;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 double shared_timer_fire_time_; 176 double shared_timer_fire_time_;
178 int shared_timer_suspended_; // counter 177 int shared_timer_suspended_; // counter
179 WebThemeEngineImpl theme_engine_; 178 WebThemeEngineImpl theme_engine_;
180 base::ThreadLocalStorage::Slot current_thread_slot_; 179 base::ThreadLocalStorage::Slot current_thread_slot_;
181 scoped_ptr<webkit::WebCompositorSupportImpl> compositor_support_; 180 scoped_ptr<webkit::WebCompositorSupportImpl> compositor_support_;
182 }; 181 };
183 182
184 } // namespace webkit_glue 183 } // namespace webkit_glue
185 184
186 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 185 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webthemeengine_impl_default.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698