| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 DEFINE_STATIC_REF(LayoutTheme, layoutTheme, (LayoutThemeAndroid::create())); | 51 DEFINE_STATIC_REF(LayoutTheme, layoutTheme, (LayoutThemeAndroid::create())); |
| 52 return *layoutTheme; | 52 return *layoutTheme; |
| 53 } | 53 } |
| 54 | 54 |
| 55 LayoutThemeAndroid::~LayoutThemeAndroid() | 55 LayoutThemeAndroid::~LayoutThemeAndroid() |
| 56 { | 56 { |
| 57 } | 57 } |
| 58 | 58 |
| 59 String LayoutThemeAndroid::extraMediaControlsStyleSheet() | 59 String LayoutThemeAndroid::extraMediaControlsStyleSheet() |
| 60 { | 60 { |
| 61 return loadResourceAsASCIIString("mediaControlsAndroid.css"); | 61 return loadResourceAsASCIIString( |
| 62 RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ? |
| 63 "mediaControlsAndroidNew.css" : "mediaControlsAndroid.css"); |
| 62 } | 64 } |
| 63 | 65 |
| 64 String LayoutThemeAndroid::extraDefaultStyleSheet() | 66 String LayoutThemeAndroid::extraDefaultStyleSheet() |
| 65 { | 67 { |
| 66 return LayoutThemeDefault::extraDefaultStyleSheet() + | 68 return LayoutThemeDefault::extraDefaultStyleSheet() + |
| 67 loadResourceAsASCIIString("themeChromiumLinux.css") + | 69 loadResourceAsASCIIString("themeChromiumLinux.css") + |
| 68 loadResourceAsASCIIString("themeChromiumAndroid.css"); | 70 loadResourceAsASCIIString("themeChromiumAndroid.css"); |
| 69 | 71 |
| 70 } | 72 } |
| 71 | 73 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 83 | 85 |
| 84 int LayoutThemeAndroid::menuListArrowPadding() const | 86 int LayoutThemeAndroid::menuListArrowPadding() const |
| 85 { | 87 { |
| 86 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. | 88 // We cannot use the scrollbar thickness here, as it's width is 0 on Android
. |
| 87 // Instead, use the width of the scrollbar down arrow. | 89 // Instead, use the width of the scrollbar down arrow. |
| 88 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); | 90 IntSize scrollbarSize = Platform::current()->themeEngine()->getSize(WebTheme
Engine::PartScrollbarDownArrow); |
| 89 return scrollbarSize.width(); | 91 return scrollbarSize.width(); |
| 90 } | 92 } |
| 91 | 93 |
| 92 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |