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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp

Issue 2443903002: Remove all "new" suffixes from media player assets. (Closed)
Patch Set: fix name Created 4 years, 1 month 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
OLDNEW
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 28 matching lines...) Expand all
39 39
40 LayoutThemeMobile::~LayoutThemeMobile() {} 40 LayoutThemeMobile::~LayoutThemeMobile() {}
41 41
42 String LayoutThemeMobile::extraDefaultStyleSheet() { 42 String LayoutThemeMobile::extraDefaultStyleSheet() {
43 return LayoutThemeDefault::extraDefaultStyleSheet() + 43 return LayoutThemeDefault::extraDefaultStyleSheet() +
44 loadResourceAsASCIIString("themeChromiumLinux.css") + 44 loadResourceAsASCIIString("themeChromiumLinux.css") +
45 loadResourceAsASCIIString("themeChromiumAndroid.css"); 45 loadResourceAsASCIIString("themeChromiumAndroid.css");
46 } 46 }
47 47
48 String LayoutThemeMobile::extraMediaControlsStyleSheet() { 48 String LayoutThemeMobile::extraMediaControlsStyleSheet() {
49 return loadResourceAsASCIIString("mediaControlsAndroidNew.css"); 49 return loadResourceAsASCIIString("mediaControlsAndroid.css");
50 } 50 }
51 51
52 String LayoutThemeMobile::extraFullscreenStyleSheet() { 52 String LayoutThemeMobile::extraFullscreenStyleSheet() {
53 return loadResourceAsASCIIString("fullscreenAndroid.css"); 53 return loadResourceAsASCIIString("fullscreenAndroid.css");
54 } 54 }
55 55
56 void LayoutThemeMobile::adjustInnerSpinButtonStyle(ComputedStyle& style) const { 56 void LayoutThemeMobile::adjustInnerSpinButtonStyle(ComputedStyle& style) const {
57 if (LayoutTestSupport::isRunningLayoutTest()) { 57 if (LayoutTestSupport::isRunningLayoutTest()) {
58 // Match Linux spin button style in layout tests. 58 // Match Linux spin button style in layout tests.
59 // FIXME: Consider removing the conditional if a future Android theme 59 // FIXME: Consider removing the conditional if a future Android theme
(...skipping 11 matching lines...) Expand all
71 #if OS(MACOSX) 71 #if OS(MACOSX)
72 // Mac WebThemeEngine cannot handle these controls. 72 // Mac WebThemeEngine cannot handle these controls.
73 ControlPart part = style.appearance(); 73 ControlPart part = style.appearance();
74 if (part == CheckboxPart || part == RadioPart) 74 if (part == CheckboxPart || part == RadioPart)
75 return true; 75 return true;
76 #endif 76 #endif
77 return LayoutThemeDefault::shouldUseFallbackTheme(style); 77 return LayoutThemeDefault::shouldUseFallbackTheme(style);
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/mediaControlsNew.css ('k') | third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698