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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 1142863004: Remove Chromium-side references to navigationTransitions.css. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « components/html_viewer/blink_resource_constants.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, 945 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS,
946 ui::SCALE_FACTOR_NONE}, 946 ui::SCALE_FACTOR_NONE},
947 #if defined(OS_MACOSX) 947 #if defined(OS_MACOSX)
948 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, 948 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE},
949 #endif 949 #endif
950 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, 950 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE},
951 {"themeWinQuirks.css", 951 {"themeWinQuirks.css",
952 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, 952 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS,
953 ui::SCALE_FACTOR_NONE}, 953 ui::SCALE_FACTOR_NONE},
954 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, 954 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE},
955 {"navigationTransitions.css",
956 IDR_UASTYLE_NAVIGATION_TRANSITIONS_CSS,
957 ui::SCALE_FACTOR_NONE},
958 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, 955 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE},
959 {"mediaControls.css", 956 {"mediaControls.css",
960 IDR_UASTYLE_MEDIA_CONTROLS_CSS, 957 IDR_UASTYLE_MEDIA_CONTROLS_CSS,
961 ui::SCALE_FACTOR_NONE}, 958 ui::SCALE_FACTOR_NONE},
962 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, 959 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE},
963 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, 960 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE},
964 {"viewportAndroid.css", 961 {"viewportAndroid.css",
965 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, 962 IDR_UASTYLE_VIEWPORT_ANDROID_CSS,
966 ui::SCALE_FACTOR_NONE}, 963 ui::SCALE_FACTOR_NONE},
967 {"InspectorOverlayPage.html", 964 {"InspectorOverlayPage.html",
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1378 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1382 static_cast<ui::DomCode>(dom_code))); 1379 static_cast<ui::DomCode>(dom_code)));
1383 } 1380 }
1384 1381
1385 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1382 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1386 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1383 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1387 code.utf8().data())); 1384 code.utf8().data()));
1388 } 1385 }
1389 1386
1390 } // namespace content 1387 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/blink_resource_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698