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

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

Issue 376033002: Adding MimeHandlerView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pending-zork-patch2
Patch Set: Address comment from kenrb@ Created 6 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
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 12 matching lines...) Expand all
23 #include "chrome/common/extensions/extension_constants.h" 23 #include "chrome/common/extensions/extension_constants.h"
24 #include "chrome/common/extensions/extension_process_policy.h" 24 #include "chrome/common/extensions/extension_process_policy.h"
25 #include "chrome/common/localized_error.h" 25 #include "chrome/common/localized_error.h"
26 #include "chrome/common/pepper_permission_util.h" 26 #include "chrome/common/pepper_permission_util.h"
27 #include "chrome/common/render_messages.h" 27 #include "chrome/common/render_messages.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "chrome/grit/generated_resources.h" 29 #include "chrome/grit/generated_resources.h"
30 #include "chrome/grit/locale_settings.h" 30 #include "chrome/grit/locale_settings.h"
31 #include "chrome/grit/renderer_resources.h" 31 #include "chrome/grit/renderer_resources.h"
32 #include "chrome/renderer/benchmarking_extension.h" 32 #include "chrome/renderer/benchmarking_extension.h"
33 #include "chrome/renderer/browser_plugin/chrome_browser_plugin_delegate.h"
33 #include "chrome/renderer/chrome_render_frame_observer.h" 34 #include "chrome/renderer/chrome_render_frame_observer.h"
34 #include "chrome/renderer/chrome_render_process_observer.h" 35 #include "chrome/renderer/chrome_render_process_observer.h"
35 #include "chrome/renderer/chrome_render_view_observer.h" 36 #include "chrome/renderer/chrome_render_view_observer.h"
36 #include "chrome/renderer/content_settings_observer.h" 37 #include "chrome/renderer/content_settings_observer.h"
37 #include "chrome/renderer/extensions/chrome_extension_helper.h" 38 #include "chrome/renderer/extensions/chrome_extension_helper.h"
38 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 39 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
39 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" 40 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
40 #include "chrome/renderer/extensions/extension_frame_helper.h" 41 #include "chrome/renderer/extensions/extension_frame_helper.h"
41 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" 42 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
42 #include "chrome/renderer/extensions/resource_request_policy.h" 43 #include "chrome/renderer/extensions/resource_request_policy.h"
(...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 1518
1518 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_)) 1519 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
1519 return true; 1520 return true;
1520 1521
1521 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); 1522 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
1522 return channel <= chrome::VersionInfo::CHANNEL_DEV; 1523 return channel <= chrome::VersionInfo::CHANNEL_DEV;
1523 #else 1524 #else
1524 return false; 1525 return false;
1525 #endif 1526 #endif
1526 } 1527 }
1528
1529 content::BrowserPluginDelegate*
1530 ChromeContentRendererClient::CreateBrowserPluginDelegate(
1531 content::RenderFrame* render_frame,
1532 const std::string& mime_type) {
1533 return new ChromeBrowserPluginDelegate(render_frame, mime_type);
1534 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698