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

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

Issue 11012003: Clean up Android default command line flags. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 2 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 | « no previous file | content/browser/android/content_startup_flags.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/android_browser_process.h" 5 #include "content/browser/android/android_browser_process.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/debug/debugger.h" 8 #include "base/debug/debugger.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/browser/android/content_startup_flags.h" 10 #include "content/browser/android/content_startup_flags.h"
11 #include "content/public/common/content_constants.h" 11 #include "content/public/common/content_constants.h"
12 #include "jni/AndroidBrowserProcess_jni.h" 12 #include "jni/AndroidBrowserProcess_jni.h"
13 13
14 using base::android::ConvertJavaStringToUTF8; 14 using base::android::ConvertJavaStringToUTF8;
15 15
16 namespace content { 16 namespace content {
17 17
18 static void SetCommandLineFlags(JNIEnv*env, 18 static void SetCommandLineFlags(JNIEnv*env,
19 jclass clazz, 19 jclass clazz,
20 jint max_render_process_count, 20 jint max_render_process_count) {
21 jstring plugin_descriptor) { 21 SetContentCommandLineFlags(max_render_process_count);
22 std::string plugin_str = ConvertJavaStringToUTF8(env, plugin_descriptor);
23 SetContentCommandLineFlags(max_render_process_count, plugin_str);
24 } 22 }
25 23
26 static jboolean IsOfficialBuild(JNIEnv* env, jclass clazz) { 24 static jboolean IsOfficialBuild(JNIEnv* env, jclass clazz) {
27 #if defined(OFFICIAL_BUILD) 25 #if defined(OFFICIAL_BUILD)
28 return true; 26 return true;
29 #else 27 #else
30 return false; 28 return false;
31 #endif 29 #endif
32 } 30 }
33 31
34 bool RegisterAndroidBrowserProcess(JNIEnv* env) { 32 bool RegisterAndroidBrowserProcess(JNIEnv* env) {
35 return RegisterNativesImpl(env); 33 return RegisterNativesImpl(env);
36 } 34 }
37 35
38 } // namespace 36 } // namespace
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_startup_flags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698