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

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

Issue 14424007: Use the default theme as the fallback UI in Blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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 #include "webkit/glue/webkitplatformsupport_impl.h" 5 #include "webkit/glue/webkitplatformsupport_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "webkit/plugins/webplugininfo.h" 56 #include "webkit/plugins/webplugininfo.h"
57 #include "webkit/user_agent/user_agent.h" 57 #include "webkit/user_agent/user_agent.h"
58 58
59 #if defined(OS_ANDROID) 59 #if defined(OS_ANDROID)
60 #include "webkit/glue/fling_animator_impl_android.h" 60 #include "webkit/glue/fling_animator_impl_android.h"
61 #endif 61 #endif
62 62
63 using WebKit::WebAudioBus; 63 using WebKit::WebAudioBus;
64 using WebKit::WebCookie; 64 using WebKit::WebCookie;
65 using WebKit::WebData; 65 using WebKit::WebData;
66 using WebKit::WebFallbackThemeEngine;
66 using WebKit::WebLocalizedString; 67 using WebKit::WebLocalizedString;
67 using WebKit::WebPluginListBuilder; 68 using WebKit::WebPluginListBuilder;
68 using WebKit::WebString; 69 using WebKit::WebString;
69 using WebKit::WebSocketStreamHandle; 70 using WebKit::WebSocketStreamHandle;
70 using WebKit::WebThemeEngine; 71 using WebKit::WebThemeEngine;
71 using WebKit::WebURL; 72 using WebKit::WebURL;
72 using WebKit::WebURLError; 73 using WebKit::WebURLError;
73 using WebKit::WebURLLoader; 74 using WebKit::WebURLLoader;
74 using WebKit::WebVector; 75 using WebKit::WebVector;
75 76
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { 379 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
379 } 380 }
380 381
381 void WebKitPlatformSupportImpl::SetFlingCurveParameters( 382 void WebKitPlatformSupportImpl::SetFlingCurveParameters(
382 const std::vector<float>& new_touchpad, 383 const std::vector<float>& new_touchpad,
383 const std::vector<float>& new_touchscreen) { 384 const std::vector<float>& new_touchscreen) {
384 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); 385 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen);
385 } 386 }
386 387
387 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { 388 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() {
388 return &theme_engine_; 389 return &native_theme_engine_;
390 }
391
392 WebFallbackThemeEngine* WebKitPlatformSupportImpl::fallbackThemeEngine() {
393 return &fallback_theme_engine_;
389 } 394 }
390 395
391 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { 396 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() {
392 return new WebURLLoaderImpl(this); 397 return new WebURLLoaderImpl(this);
393 } 398 }
394 399
395 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { 400 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() {
396 return new WebSocketStreamHandleImpl(this); 401 return new WebSocketStreamHandleImpl(this);
397 } 402 }
398 403
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 } 1003 }
999 1004
1000 #if defined(OS_ANDROID) 1005 #if defined(OS_ANDROID)
1001 webkit_media::WebAudioMediaCodecRunner 1006 webkit_media::WebAudioMediaCodecRunner
1002 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { 1007 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() {
1003 return base::Bind(&NullRunWebAudioMediaCodec); 1008 return base::Bind(&NullRunWebAudioMediaCodec);
1004 } 1009 }
1005 #endif 1010 #endif
1006 1011
1007 } // namespace webkit_glue 1012 } // namespace webkit_glue
OLDNEW
« ui/native_theme/fallback_theme.cc ('K') | « webkit/glue/webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698