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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/android/browser_jni_registrar.cc » ('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 "chrome/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 27 matching lines...) Expand all
38 #include "third_party/sqlite/sqlite3.h" 38 #include "third_party/sqlite/sqlite3.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 45 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
46 #include "v8/include/v8.h" 46 #include "v8/include/v8.h"
47 47
48 #if defined(OS_ANDROID)
49 #include "webkit/media/android/webmediaplayer_android.h"
50 #endif
51
52 #if defined(OS_WIN) 48 #if defined(OS_WIN)
53 #include "base/win/iat_patch_function.h" 49 #include "base/win/iat_patch_function.h"
54 #endif 50 #endif
55 51
56 #if defined(USE_TCMALLOC) 52 #if defined(USE_TCMALLOC)
57 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 53 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
58 #endif 54 #endif
59 55
60 using WebKit::WebCache; 56 using WebKit::WebCache;
61 using WebKit::WebCrossOriginPreflightResultCache; 57 using WebKit::WebCrossOriginPreflightResultCache;
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 IPC_MESSAGE_HANDLER(ChromeViewMsg_ToggleWebKitSharedTimer, 231 IPC_MESSAGE_HANDLER(ChromeViewMsg_ToggleWebKitSharedTimer,
236 OnToggleWebKitSharedTimer) 232 OnToggleWebKitSharedTimer)
237 IPC_MESSAGE_UNHANDLED(handled = false) 233 IPC_MESSAGE_UNHANDLED(handled = false)
238 IPC_END_MESSAGE_MAP() 234 IPC_END_MESSAGE_MAP()
239 return handled; 235 return handled;
240 } 236 }
241 237
242 void ChromeRenderProcessObserver::OnSetIsIncognitoProcess( 238 void ChromeRenderProcessObserver::OnSetIsIncognitoProcess(
243 bool is_incognito_process) { 239 bool is_incognito_process) {
244 is_incognito_process_ = is_incognito_process; 240 is_incognito_process_ = is_incognito_process;
245 #if defined(OS_ANDROID)
246 webkit_media::WebMediaPlayerAndroid::InitIncognito(is_incognito_process_);
247 #endif
248 } 241 }
249 242
250 void ChromeRenderProcessObserver::OnSetContentSettingRules( 243 void ChromeRenderProcessObserver::OnSetContentSettingRules(
251 const RendererContentSettingRules& rules) { 244 const RendererContentSettingRules& rules) {
252 content_setting_rules_ = rules; 245 content_setting_rules_ = rules;
253 } 246 }
254 247
255 void ChromeRenderProcessObserver::OnSetCacheCapacities(size_t min_dead_capacity, 248 void ChromeRenderProcessObserver::OnSetCacheCapacities(size_t min_dead_capacity,
256 size_t max_dead_capacity, 249 size_t max_dead_capacity,
257 size_t capacity) { 250 size_t capacity) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 if (clear_cache_pending_) { 349 if (clear_cache_pending_) {
357 clear_cache_pending_ = false; 350 clear_cache_pending_ = false;
358 WebCache::clear(); 351 WebCache::clear();
359 } 352 }
360 } 353 }
361 354
362 const RendererContentSettingRules* 355 const RendererContentSettingRules*
363 ChromeRenderProcessObserver::content_setting_rules() const { 356 ChromeRenderProcessObserver::content_setting_rules() const {
364 return &content_setting_rules_; 357 return &content_setting_rules_;
365 } 358 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698