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

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

Issue 12026010: Add GOOGLE_TV build tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add missing header Created 7 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
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/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "cc/switches.h" 10 #include "cc/switches.h"
11 #include "content/public/browser/render_process_host.h" 11 #include "content/public/browser/render_process_host.h"
12 #include "content/public/common/content_constants.h" 12 #include "content/public/common/content_constants.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "media/base/media_switches.h"
14 #include "ui/base/ui_base_switches.h" 15 #include "ui/base/ui_base_switches.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 void SetContentCommandLineFlags(int max_render_process_count) { 19 void SetContentCommandLineFlags(int max_render_process_count) {
19 // May be called multiple times, to cover all possible program entry points. 20 // May be called multiple times, to cover all possible program entry points.
20 static bool already_initialized = false; 21 static bool already_initialized = false;
21 if (already_initialized) 22 if (already_initialized)
22 return; 23 return;
23 already_initialized = true; 24 already_initialized = true;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch); 61 parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch);
61 62
62 // Run the GPU service as a thread in the browser instead of as a 63 // Run the GPU service as a thread in the browser instead of as a
63 // standalone process. 64 // standalone process.
64 parsed_command_line->AppendSwitch(switches::kInProcessGPU); 65 parsed_command_line->AppendSwitch(switches::kInProcessGPU);
65 66
66 // Always use fixed layout and viewport tag. 67 // Always use fixed layout and viewport tag.
67 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); 68 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
68 parsed_command_line->AppendSwitch(switches::kEnableViewport); 69 parsed_command_line->AppendSwitch(switches::kEnableViewport);
69 70
71 #if defined(ANDROID_TV)
72 // Cdm plugin should run out of proces
Yaron 2013/01/23 00:45:28 What's the "Cdm plugin"? Can you add a TODO and fi
kjyoun 2013/01/23 21:02:57 Cdm plugin is a pepper plugin to support Encrypted
Yaron 2013/01/24 00:32:29 Please add a TODO and file a crbug as requested (p
kjyoun 2013/01/24 00:55:46 Done.
73 // Will remove this part, when "out-of-process" becomes default.
74 parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess);
75
76 parsed_command_line->AppendSwitch(switches::kEnableEncryptedMedia);
77 #endif
78
70 // FIXME(aelias): Commented out due to flaky tests. 79 // FIXME(aelias): Commented out due to flaky tests.
71 // parsed_command_line->AppendSwitch( 80 // parsed_command_line->AppendSwitch(
72 // cc::switches::kEnableCompositorFrameMessage); 81 // cc::switches::kEnableCompositorFrameMessage);
73 } 82 }
74 83
75 } // namespace content 84 } // namespace content
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | webkit/glue/webpreferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698