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

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: Use aura colors for fallback theme Created 7 years, 8 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::WebURLLoader; 73 using WebKit::WebURLLoader;
73 using WebKit::WebVector; 74 using WebKit::WebVector;
74 75
75 namespace { 76 namespace {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { 378 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
378 } 379 }
379 380
380 void WebKitPlatformSupportImpl::SetFlingCurveParameters( 381 void WebKitPlatformSupportImpl::SetFlingCurveParameters(
381 const std::vector<float>& new_touchpad, 382 const std::vector<float>& new_touchpad,
382 const std::vector<float>& new_touchscreen) { 383 const std::vector<float>& new_touchscreen) {
383 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); 384 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen);
384 } 385 }
385 386
386 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { 387 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() {
387 return &theme_engine_; 388 return &native_theme_engine_;
389 }
390
391 WebFallbackThemeEngine* WebKitPlatformSupportImpl::fallbackThemeEngine() {
392 return &fallback_theme_engine_;
388 } 393 }
389 394
390 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { 395 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() {
391 return new WebURLLoaderImpl(this); 396 return new WebURLLoaderImpl(this);
392 } 397 }
393 398
394 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() { 399 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() {
395 return new WebSocketStreamHandleImpl(this); 400 return new WebSocketStreamHandleImpl(this);
396 } 401 }
397 402
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 } 999 }
995 1000
996 #if defined(OS_ANDROID) 1001 #if defined(OS_ANDROID)
997 webkit_media::WebAudioMediaCodecRunner 1002 webkit_media::WebAudioMediaCodecRunner
998 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { 1003 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() {
999 return base::Bind(&NullRunWebAudioMediaCodec); 1004 return base::Bind(&NullRunWebAudioMediaCodec);
1000 } 1005 }
1001 #endif 1006 #endif
1002 1007
1003 } // namespace webkit_glue 1008 } // namespace webkit_glue
OLDNEW
« ui/native_theme/native_theme_aura.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