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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 733293002: [Android] Add a flag to disable the pull-to-refresh effect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('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 (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 "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 10 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 BrowserViewRenderer::CalculateTileMemoryPolicy(); 56 BrowserViewRenderer::CalculateTileMemoryPolicy();
57 57
58 base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); 58 base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
59 cl->AppendSwitch(switches::kEnableBeginFrameScheduling); 59 cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
60 cl->AppendSwitch(switches::kEnableImplSidePainting); 60 cl->AppendSwitch(switches::kEnableImplSidePainting);
61 61
62 // WebView uses the Android system's scrollbars and overscroll glow. 62 // WebView uses the Android system's scrollbars and overscroll glow.
63 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); 63 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
64 64
65 // Pull-to-refresh should never be a default WebView action.
66 cl->AppendSwitch(switches::kDisablePullToRefreshEffect);
67
65 // Not yet supported in single-process mode. 68 // Not yet supported in single-process mode.
66 cl->AppendSwitch(switches::kDisableSharedWorkers); 69 cl->AppendSwitch(switches::kDisableSharedWorkers);
67 70
68 // File system API not supported (requires some new API; internal bug 6930981) 71 // File system API not supported (requires some new API; internal bug 6930981)
69 cl->AppendSwitch(switches::kDisableFileSystem); 72 cl->AppendSwitch(switches::kDisableFileSystem);
70 73
71 #if defined(VIDEO_HOLE) 74 #if defined(VIDEO_HOLE)
72 // Support EME/L1 with hole-punching. 75 // Support EME/L1 with hole-punching.
73 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 76 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
74 #endif 77 #endif
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 157
155 #if defined(VIDEO_HOLE) 158 #if defined(VIDEO_HOLE)
156 content::ExternalVideoSurfaceContainer* 159 content::ExternalVideoSurfaceContainer*
157 AwMainDelegate::CreateExternalVideoSurfaceContainer( 160 AwMainDelegate::CreateExternalVideoSurfaceContainer(
158 content::WebContents* web_contents) { 161 content::WebContents* web_contents) {
159 return new ExternalVideoSurfaceContainerImpl(web_contents); 162 return new ExternalVideoSurfaceContainerImpl(web_contents);
160 } 163 }
161 #endif 164 #endif
162 165
163 } // namespace android_webview 166 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698