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

Side by Side Diff: content/public/common/web_preferences.cc

Issue 2673963002: Drop hover:on-demand support & let touch-screens report "none" instead. (Closed)
Patch Set: Fixed a "yikes!" Created 3 years, 9 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 | « no previous file | third_party/WebKit/LayoutTests/fast/media/mq-hover.html » ('j') | 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/public/common/web_preferences.h" 5 #include "content/public/common/web_preferences.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "third_party/WebKit/public/web/WebSettings.h" 10 #include "third_party/WebKit/public/web/WebSettings.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 48 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
49 WebSettings::ImageAnimationPolicyAnimateOnce); 49 WebSettings::ImageAnimationPolicyAnimateOnce);
50 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION, 50 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION,
51 WebSettings::ImageAnimationPolicyNoAnimation); 51 WebSettings::ImageAnimationPolicyNoAnimation);
52 52
53 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone); 53 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone);
54 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse); 54 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse);
55 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine); 55 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine);
56 56
57 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_NONE, blink::HoverTypeNone); 57 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_NONE, blink::HoverTypeNone);
58 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_ON_DEMAND, blink::HoverTypeOnDemand);
59 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_HOVER, blink::HoverTypeHover); 58 STATIC_ASSERT_ENUM(ui::HOVER_TYPE_HOVER, blink::HoverTypeHover);
60 59
61 STATIC_ASSERT_ENUM(ViewportStyle::DEFAULT, blink::WebViewportStyle::Default); 60 STATIC_ASSERT_ENUM(ViewportStyle::DEFAULT, blink::WebViewportStyle::Default);
62 STATIC_ASSERT_ENUM(ViewportStyle::MOBILE, blink::WebViewportStyle::Mobile); 61 STATIC_ASSERT_ENUM(ViewportStyle::MOBILE, blink::WebViewportStyle::Mobile);
63 STATIC_ASSERT_ENUM(ViewportStyle::TELEVISION, 62 STATIC_ASSERT_ENUM(ViewportStyle::TELEVISION,
64 blink::WebViewportStyle::Television); 63 blink::WebViewportStyle::Television);
65 64
66 WebPreferences::WebPreferences() 65 WebPreferences::WebPreferences()
67 : default_font_size(16), 66 : default_font_size(16),
68 default_fixed_font_size(13), 67 default_fixed_font_size(13),
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 pictograph_font_family_map[kCommonScript] = 240 pictograph_font_family_map[kCommonScript] =
242 base::ASCIIToUTF16("Times New Roman"); 241 base::ASCIIToUTF16("Times New Roman");
243 } 242 }
244 243
245 WebPreferences::WebPreferences(const WebPreferences& other) = default; 244 WebPreferences::WebPreferences(const WebPreferences& other) = default;
246 245
247 WebPreferences::~WebPreferences() { 246 WebPreferences::~WebPreferences() {
248 } 247 }
249 248
250 } // namespace content 249 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/media/mq-hover.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698