| Index: third_party/WebKit/public/blink_resources.grd
|
| diff --git a/third_party/WebKit/public/blink_resources.grd b/third_party/WebKit/public/blink_resources.grd
|
| index f00f34bbf645e6f87887e4ba6f105b2419717c59..880414450050cf16b6cc8c3749f29b0f9d164958 100644
|
| --- a/third_party/WebKit/public/blink_resources.grd
|
| +++ b/third_party/WebKit/public/blink_resources.grd
|
| @@ -11,15 +11,11 @@
|
| <include name="IDR_UASTYLE_HTML_CSS" file="../Source/core/css/html.css" type="BINDATA"/>
|
| <include name="IDR_UASTYLE_QUIRKS_CSS" file="../Source/core/css/quirks.css" type="BINDATA"/>
|
| <include name="IDR_UASTYLE_VIEW_SOURCE_CSS" file="../Source/core/css/view-source.css" type="BINDATA"/>
|
| - <if expr="is_android">
|
| - <include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../Source/core/css/themeChromiumAndroid.css" type="BINDATA"/>
|
| - <include name="IDR_UASTYLE_FULLSCREEN_ANDROID_CSS" file="../Source/core/css/fullscreenAndroid.css" type="BINDATA"/>
|
| - <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="../Source/core/css/mediaControlsAndroid.css" type="BINDATA"/>
|
| - <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS" file="../Source/core/css/mediaControlsAndroidNew.css" type="BINDATA"/>
|
| - </if>
|
| - <if expr="not is_win">
|
| - <include name="IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS" file="../Source/core/css/themeChromiumLinux.css" type="BINDATA"/>
|
| - </if>
|
| + <include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../Source/core/css/themeChromiumAndroid.css" type="BINDATA"/>
|
| + <include name="IDR_UASTYLE_FULLSCREEN_ANDROID_CSS" file="../Source/core/css/fullscreenAndroid.css" type="BINDATA"/>
|
| + <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="../Source/core/css/mediaControlsAndroid.css" type="BINDATA"/>
|
| + <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS" file="../Source/core/css/mediaControlsAndroidNew.css" type="BINDATA"/>
|
| + <include name="IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS" file="../Source/core/css/themeChromiumLinux.css" type="BINDATA"/>
|
| <if expr="is_macosx">
|
| <include name="IDR_UASTYLE_THEME_MAC_CSS" file="../Source/core/css/themeMac.css" type="BINDATA"/>
|
| </if>
|
|
|