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

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

Issue 702433002: Refactor GuestViewContainer to split out WebView related logic and MimeHandlerView related logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | content/public/renderer/browser_plugin_delegate.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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #include "chrome/renderer/extensions/extension_frame_helper.h" 113 #include "chrome/renderer/extensions/extension_frame_helper.h"
114 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" 114 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
115 #include "chrome/renderer/extensions/resource_request_policy.h" 115 #include "chrome/renderer/extensions/resource_request_policy.h"
116 #include "extensions/common/extension.h" 116 #include "extensions/common/extension.h"
117 #include "extensions/common/extension_set.h" 117 #include "extensions/common/extension_set.h"
118 #include "extensions/common/extension_urls.h" 118 #include "extensions/common/extension_urls.h"
119 #include "extensions/common/switches.h" 119 #include "extensions/common/switches.h"
120 #include "extensions/renderer/dispatcher.h" 120 #include "extensions/renderer/dispatcher.h"
121 #include "extensions/renderer/extension_helper.h" 121 #include "extensions/renderer/extension_helper.h"
122 #include "extensions/renderer/extensions_render_frame_observer.h" 122 #include "extensions/renderer/extensions_render_frame_observer.h"
123 #include "extensions/renderer/guest_view/guest_view_container.h" 123 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
124 #include "extensions/renderer/guest_view/mime_handler_view_container.h"
124 #include "extensions/renderer/script_context.h" 125 #include "extensions/renderer/script_context.h"
125 #endif 126 #endif
126 127
127 #if defined(ENABLE_FULL_PRINTING) 128 #if defined(ENABLE_FULL_PRINTING)
128 #include "chrome/renderer/pepper/chrome_pdf_print_client.h" 129 #include "chrome/renderer/pepper/chrome_pdf_print_client.h"
129 #endif 130 #endif
130 131
131 #if defined(ENABLE_SPELLCHECK) 132 #if defined(ENABLE_SPELLCHECK)
132 #include "chrome/renderer/spellchecker/spellcheck.h" 133 #include "chrome/renderer/spellchecker/spellcheck.h"
133 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 134 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
(...skipping 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 #else 1581 #else
1581 return false; 1582 return false;
1582 #endif 1583 #endif
1583 } 1584 }
1584 1585
1585 content::BrowserPluginDelegate* 1586 content::BrowserPluginDelegate*
1586 ChromeContentRendererClient::CreateBrowserPluginDelegate( 1587 ChromeContentRendererClient::CreateBrowserPluginDelegate(
1587 content::RenderFrame* render_frame, 1588 content::RenderFrame* render_frame,
1588 const std::string& mime_type) { 1589 const std::string& mime_type) {
1589 #if defined(ENABLE_EXTENSIONS) 1590 #if defined(ENABLE_EXTENSIONS)
1590 return new extensions::GuestViewContainer(render_frame, mime_type); 1591 if (mime_type == content::kBrowserPluginMimeType)
1592 return new extensions::ExtensionsGuestViewContainer(render_frame);
1593 else
1594 return new extensions::MimeHandlerViewContainer(render_frame, mime_type);
1591 #else 1595 #else
1592 return NULL; 1596 return NULL;
1593 #endif 1597 #endif
1594 } 1598 }
OLDNEW
« no previous file with comments | « no previous file | content/public/renderer/browser_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698