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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 725293005: We previously had a setting in chrome defaults but this deprecates that for a command line flag and… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2171_62
Patch Set: Created 6 years 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3997 matching lines...) Expand 10 before | Expand all | Expand 10 after
4008 if (!main_frame) 4008 if (!main_frame)
4009 return; 4009 return;
4010 main_frame->enableViewSourceMode(true); 4010 main_frame->enableViewSourceMode(true);
4011 } 4011 }
4012 4012
4013 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) 4013 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
4014 bool RenderViewImpl::didTapMultipleTargets( 4014 bool RenderViewImpl::didTapMultipleTargets(
4015 const WebSize& inner_viewport_offset, 4015 const WebSize& inner_viewport_offset,
4016 const WebRect& touch_rect, 4016 const WebRect& touch_rect,
4017 const WebVector<WebRect>& target_rects) { 4017 const WebVector<WebRect>& target_rects) {
4018 if (!switches::IsLinkDisambiguationPopupEnabled())
4019 return false;
4020
4018 // Never show a disambiguation popup when accessibility is enabled, 4021 // Never show a disambiguation popup when accessibility is enabled,
4019 // as this interferes with "touch exploration". 4022 // as this interferes with "touch exploration".
4020 AccessibilityMode accessibility_mode = 4023 AccessibilityMode accessibility_mode =
4021 GetMainRenderFrame()->accessibility_mode(); 4024 GetMainRenderFrame()->accessibility_mode();
4022 bool matches_accessibility_mode_complete = 4025 bool matches_accessibility_mode_complete =
4023 (accessibility_mode & AccessibilityModeComplete) == 4026 (accessibility_mode & AccessibilityModeComplete) ==
4024 AccessibilityModeComplete; 4027 AccessibilityModeComplete;
4025 if (matches_accessibility_mode_complete) 4028 if (matches_accessibility_mode_complete)
4026 return false; 4029 return false;
4027 4030
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
4184 std::vector<gfx::Size> sizes; 4187 std::vector<gfx::Size> sizes;
4185 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4188 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4186 if (!url.isEmpty()) 4189 if (!url.isEmpty())
4187 urls.push_back( 4190 urls.push_back(
4188 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4191 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4189 } 4192 }
4190 SendUpdateFaviconURL(urls); 4193 SendUpdateFaviconURL(urls);
4191 } 4194 }
4192 4195
4193 } // namespace content 4196 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698