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

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: Rebase Created 7 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); 68 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
69 parsed_command_line->AppendSwitch(switches::kEnableViewport); 69 parsed_command_line->AppendSwitch(switches::kEnableViewport);
70 70
71 parsed_command_line->AppendSwitch( 71 parsed_command_line->AppendSwitch(
72 cc::switches::kEnableCompositorFrameMessage); 72 cc::switches::kEnableCompositorFrameMessage);
73 73
74 if (!plugin_descriptor.empty()) { 74 if (!plugin_descriptor.empty()) {
75 parsed_command_line->AppendSwitchNative( 75 parsed_command_line->AppendSwitchNative(
76 switches::kRegisterPepperPlugins, plugin_descriptor); 76 switches::kRegisterPepperPlugins, plugin_descriptor);
77 } 77 }
78
79 #if defined(OS_ANDROID)
aelias_OOO_until_Jul13 2013/05/10 04:37:07 No need for #if defined(), this is already in an a
jdduke (slow) 2013/05/10 16:39:52 Done.
80 parsed_command_line->AppendSwitch(switches::kEnableOverscrollEdgeEffect);
81 #endif
78 } 82 }
79 83
80 } // namespace content 84 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.h » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698