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

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

Issue 3915002: Out of process Pepper (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ipc/ipc_message_utils.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2516 matching lines...) Expand 10 before | Expand all | Expand 10 after
2527 return CreateOutdatedPluginPlaceholder(frame, params, group.get()); 2527 return CreateOutdatedPluginPlaceholder(frame, params, group.get());
2528 } 2528 }
2529 return NULL; 2529 return NULL;
2530 } 2530 }
2531 2531
2532 ContentSetting host_setting = 2532 ContentSetting host_setting =
2533 current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS]; 2533 current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
2534 if (info.path.value() == kDefaultPluginLibraryName || 2534 if (info.path.value() == kDefaultPluginLibraryName ||
2535 plugin_setting == CONTENT_SETTING_ALLOW || 2535 plugin_setting == CONTENT_SETTING_ALLOW ||
2536 host_setting == CONTENT_SETTING_ALLOW) { 2536 host_setting == CONTENT_SETTING_ALLOW) {
2537 scoped_refptr<pepper::PluginModule> pepper_module( 2537 scoped_refptr<pepper::PluginModule> pepper_module;
2538 PepperPluginRegistry::GetInstance()->GetModule(info.path)); 2538 if (PepperPluginRegistry::GetInstance()->RunOutOfProcessForPlugin(
2539 info.path)) {
2540 pepper_module =
2541 pepper_delegate_.CreateOutOfProcessPepperPlugin(info.path);
2542 } else {
2543 pepper_module =
2544 PepperPluginRegistry::GetInstance()->GetModule(info.path);
2545 }
2539 if (pepper_module) { 2546 if (pepper_module) {
2540 return CreatePepperPlugin(frame, 2547 return CreatePepperPlugin(frame,
2541 params, 2548 params,
2542 info.path, 2549 info.path,
2543 pepper_module.get()); 2550 pepper_module.get());
2544 } 2551 }
2545 return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type); 2552 return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type);
2546 } 2553 }
2547 std::string resource; 2554 std::string resource;
2548 if (cmd->HasSwitch(switches::kEnableResourceContentSettings)) 2555 if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
(...skipping 3620 matching lines...) Expand 10 before | Expand all | Expand 10 after
6169 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), 6176 IPC::PlatformFileForTransitToPlatformFile(file_for_transit),
6170 message_id); 6177 message_id);
6171 } 6178 }
6172 6179
6173 #if defined(OS_MACOSX) 6180 #if defined(OS_MACOSX)
6174 void RenderView::OnSelectPopupMenuItem(int selected_index) { 6181 void RenderView::OnSelectPopupMenuItem(int selected_index) {
6175 external_popup_menu_->DidSelectItem(selected_index); 6182 external_popup_menu_->DidSelectItem(selected_index);
6176 external_popup_menu_.reset(); 6183 external_popup_menu_.reset();
6177 } 6184 }
6178 #endif 6185 #endif
OLDNEW
« no previous file with comments | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698