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

Side by Side Diff: content/browser/android/content_startup_flags.cc

Issue 14268004: Add overscroll edge effect animations for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review. Properly disable animation on loss of focus. Created 7 years, 8 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
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/browser/android/content_startup_flags.h" 5 #include "content/browser/android/content_startup_flags.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "cc/base/switches.h" 10 #include "cc/base/switches.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 parsed_command_line->AppendSwitch( 52 parsed_command_line->AppendSwitch(
53 switches::kEnableCompositingForFixedPosition); 53 switches::kEnableCompositingForFixedPosition);
54 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); 54 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll);
55 parsed_command_line->AppendSwitch( 55 parsed_command_line->AppendSwitch(
56 switches::kEnableAcceleratedScrollableFrames); 56 switches::kEnableAcceleratedScrollableFrames);
57 parsed_command_line->AppendSwitch( 57 parsed_command_line->AppendSwitch(
58 switches::kEnableCompositedScrollingForFrames); 58 switches::kEnableCompositedScrollingForFrames);
59 59
60 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); 60 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
61 parsed_command_line->AppendSwitch(switches::kEnablePinch); 61 parsed_command_line->AppendSwitch(switches::kEnablePinch);
62 parsed_command_line->AppendSwitch(switches::kEnableOverscrollEdgeEffect);
Sami 2013/04/24 13:15:55 Does this need #ifdef OS_ANDROID?
jdduke (slow) 2013/04/24 15:23:44 Quite right.
62 63
63 // Run the GPU service as a thread in the browser instead of as a 64 // Run the GPU service as a thread in the browser instead of as a
64 // standalone process. 65 // standalone process.
65 parsed_command_line->AppendSwitch(switches::kInProcessGPU); 66 parsed_command_line->AppendSwitch(switches::kInProcessGPU);
66 67
67 // Always use fixed layout and viewport tag. 68 // Always use fixed layout and viewport tag.
68 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); 69 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
69 parsed_command_line->AppendSwitch(switches::kEnableViewport); 70 parsed_command_line->AppendSwitch(switches::kEnableViewport);
70 71
71 parsed_command_line->AppendSwitch( 72 parsed_command_line->AppendSwitch(
72 cc::switches::kEnableCompositorFrameMessage); 73 cc::switches::kEnableCompositorFrameMessage);
73 74
74 if (!plugin_descriptor.empty()) { 75 if (!plugin_descriptor.empty()) {
75 parsed_command_line->AppendSwitchNative( 76 parsed_command_line->AppendSwitchNative(
76 switches::kRegisterPepperPlugins, plugin_descriptor); 77 switches::kRegisterPepperPlugins, plugin_descriptor);
77 } 78 }
78 } 79 }
79 80
80 } // namespace content 81 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/edge_effect.h » ('j') | content/browser/android/edge_effect.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698