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

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

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change loop style Created 4 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/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 21 matching lines...) Expand all
32 if (single_process) { 32 if (single_process) {
33 // Need to ensure the command line flag is consistent as a lot of chrome 33 // Need to ensure the command line flag is consistent as a lot of chrome
34 // internal code checks this directly, but it wouldn't normally get set when 34 // internal code checks this directly, but it wouldn't normally get set when
35 // we are implementing an embedded WebView. 35 // we are implementing an embedded WebView.
36 parsed_command_line->AppendSwitch(switches::kSingleProcess); 36 parsed_command_line->AppendSwitch(switches::kSingleProcess);
37 } 37 }
38 38
39 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling); 39 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling);
40 40
41 parsed_command_line->AppendSwitch(switches::kEnablePinch); 41 parsed_command_line->AppendSwitch(switches::kEnablePinch);
42 parsed_command_line->AppendSwitch(switches::kEnableViewport);
42 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); 43 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
43 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); 44 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream);
44 45
45 if (base::android::BuildInfo::GetInstance()->sdk_int() >= 46 if (base::android::BuildInfo::GetInstance()->sdk_int() >=
46 base::android::SDK_VERSION_MARSHMALLOW) { 47 base::android::SDK_VERSION_MARSHMALLOW) {
47 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); 48 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection);
48 parsed_command_line->AppendSwitchASCII( 49 parsed_command_line->AppendSwitchASCII(
49 switches::kTouchTextSelectionStrategy, "direction"); 50 switches::kTouchTextSelectionStrategy, "direction");
50 } 51 }
51 52
(...skipping 22 matching lines...) Expand all
74 } 75 }
75 76
76 // Disable profiler timing by default. 77 // Disable profiler timing by default.
77 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { 78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {
78 parsed_command_line->AppendSwitchASCII( 79 parsed_command_line->AppendSwitchASCII(
79 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); 80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
80 } 81 }
81 } 82 }
82 83
83 } // namespace content 84 } // namespace content
OLDNEW
« no previous file with comments | « android_webview/native/aw_settings.cc ('k') | content/browser/frame_host/navigation_controller_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698