content/browser/android/content_startup_flags.cc - Issue 1649483002: Revert of Aura on Android: content/browser

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 11 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

« no previous file with comments | « content/browser/android/child_process_launcher_android.cc ('k') | content/browser/android/content_video_view.cc » ('j') | no next file with comments »

OLD	NEW
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 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 parsed_command_line->AppendSwitchNative(	73 parsed_command_line->AppendSwitchNative(

74 switches::kRegisterPepperPlugins, plugin_descriptor);	74 switches::kRegisterPepperPlugins, plugin_descriptor);

75 }	75 }

76	76

77 // Disable profiler timing by default.	77 // Disable profiler timing by default.

78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {	78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {

79 parsed_command_line->AppendSwitchASCII(	79 parsed_command_line->AppendSwitchASCII(

80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);	80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);

81 }	81 }

82	82

83 #if !defined(USE_AURA)

84 cc::LayerSettings layer_settings;	83 cc::LayerSettings layer_settings;

85 layer_settings.use_compositor_animation_timelines =	84 layer_settings.use_compositor_animation_timelines =

86 !parsed_command_line->HasSwitch(	85 !parsed_command_line->HasSwitch(

87 switches::kDisableAndroidCompositorAnimationTimelines);	86 switches::kDisableAndroidCompositorAnimationTimelines);

88 Compositor::SetLayerSettings(layer_settings);	87 Compositor::SetLayerSettings(layer_settings);

89 #endif

90 }	88 }

91	89

92 } // namespace content	90 } // namespace content

OLD	NEW