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

Side by Side Diff: content/child/webkitplatformsupport_child_impl.h

Issue 160023003: Move webfallbackthemeengine_impl.* to content/child/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « content/child/webfallbackthemeengine_impl.cc ('k') | content/content_child.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 // // Copyright 2014 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 CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ 5 #ifndef CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_
6 #define CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ 6 #define CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_
7 7
8 #include "base/threading/thread_local_storage.h" 8 #include "base/threading/thread_local_storage.h"
9 #include "content/child/webfallbackthemeengine_impl.h"
9 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
10 #include "webkit/child/webfallbackthemeengine_impl.h"
11 #include "webkit/child/webkit_child_export.h" 11 #include "webkit/child/webkit_child_export.h"
12 #include "webkit/child/webkitplatformsupport_impl.h" 12 #include "webkit/child/webkitplatformsupport_impl.h"
13 13
14 #if defined(USE_DEFAULT_RENDER_THEME) 14 #if defined(USE_DEFAULT_RENDER_THEME)
15 #include "content/child/webthemeengine_impl_default.h" 15 #include "content/child/webthemeengine_impl_default.h"
16 #elif defined(OS_WIN) 16 #elif defined(OS_WIN)
17 #include "content/child/webthemeengine_impl_win.h" 17 #include "content/child/webthemeengine_impl_win.h"
18 #elif defined(OS_MACOSX) 18 #elif defined(OS_MACOSX)
19 #include "content/child/webthemeengine_impl_mac.h" 19 #include "content/child/webthemeengine_impl_mac.h"
20 #elif defined(OS_ANDROID) 20 #elif defined(OS_ANDROID)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual void didStopWorkerRunLoop( 58 virtual void didStopWorkerRunLoop(
59 const blink::WebWorkerRunLoop& runLoop) OVERRIDE; 59 const blink::WebWorkerRunLoop& runLoop) OVERRIDE;
60 60
61 virtual blink::WebDiscardableMemory* allocateAndLockDiscardableMemory( 61 virtual blink::WebDiscardableMemory* allocateAndLockDiscardableMemory(
62 size_t bytes); 62 size_t bytes);
63 63
64 private: 64 private:
65 static void DestroyCurrentThread(void*); 65 static void DestroyCurrentThread(void*);
66 66
67 WebThemeEngineImpl native_theme_engine_; 67 WebThemeEngineImpl native_theme_engine_;
68 webkit_glue::WebFallbackThemeEngineImpl fallback_theme_engine_; 68 content::WebFallbackThemeEngineImpl fallback_theme_engine_;
jamesr 2014/02/11 20:58:14 you're already in namespace content
69 base::ThreadLocalStorage::Slot current_thread_slot_; 69 base::ThreadLocalStorage::Slot current_thread_slot_;
70 scoped_ptr<webkit_glue::FlingCurveConfiguration> fling_curve_configuration_; 70 scoped_ptr<webkit_glue::FlingCurveConfiguration> fling_curve_configuration_;
71 }; 71 };
72 72
73 } // namespace content 73 } // namespace content
74 74
75 #endif // CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_ 75 #endif // CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_
OLDNEW
« no previous file with comments | « content/child/webfallbackthemeengine_impl.cc ('k') | content/content_child.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698