| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer/render_view.h" | 5 #include "content/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 3019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3030 // webkit_glue::WebPluginPageDelegate ----------------------------------------- | 3030 // webkit_glue::WebPluginPageDelegate ----------------------------------------- |
| 3031 | 3031 |
| 3032 webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate( | 3032 webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate( |
| 3033 const FilePath& file_path, | 3033 const FilePath& file_path, |
| 3034 const std::string& mime_type) { | 3034 const std::string& mime_type) { |
| 3035 if (!PluginChannelHost::IsListening()) | 3035 if (!PluginChannelHost::IsListening()) |
| 3036 return NULL; | 3036 return NULL; |
| 3037 | 3037 |
| 3038 bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins(); | 3038 bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins(); |
| 3039 if (in_process_plugin) { | 3039 if (in_process_plugin) { |
| 3040 #if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac. | 3040 #if defined(OS_WIN) && !defined(USE_AURA) |
| 3041 return webkit::npapi::WebPluginDelegateImpl::Create( | 3041 return webkit::npapi::WebPluginDelegateImpl::Create( |
| 3042 file_path, mime_type, gfx::NativeViewFromId(host_window_)); | 3042 file_path, mime_type, gfx::NativeViewFromId(host_window_)); |
| 3043 #else | 3043 #else |
| 3044 // In-proc plugins aren't supported on non-Windows. |
| 3044 NOTIMPLEMENTED(); | 3045 NOTIMPLEMENTED(); |
| 3045 return NULL; | 3046 return NULL; |
| 3046 #endif | 3047 #endif |
| 3047 } | 3048 } |
| 3048 | 3049 |
| 3049 return new WebPluginDelegateProxy(mime_type, AsWeakPtr()); | 3050 return new WebPluginDelegateProxy(mime_type, AsWeakPtr()); |
| 3050 } | 3051 } |
| 3051 | 3052 |
| 3052 void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) { | 3053 void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) { |
| 3053 #if defined(USE_X11) | 3054 #if defined(USE_X11) |
| (...skipping 1529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4583 } | 4584 } |
| 4584 | 4585 |
| 4585 void RenderView::OnEnableViewSourceMode() { | 4586 void RenderView::OnEnableViewSourceMode() { |
| 4586 if (!webview()) | 4587 if (!webview()) |
| 4587 return; | 4588 return; |
| 4588 WebFrame* main_frame = webview()->mainFrame(); | 4589 WebFrame* main_frame = webview()->mainFrame(); |
| 4589 if (!main_frame) | 4590 if (!main_frame) |
| 4590 return; | 4591 return; |
| 4591 main_frame->enableViewSourceMode(true); | 4592 main_frame->enableViewSourceMode(true); |
| 4592 } | 4593 } |
| OLD | NEW |