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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 7545018: Remove --enable-remoting flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 64fca21a786ef35ee1362ed29a8e3c135c0c937d..1adc397d11d727b375d7a318537a35433aa5c60b 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -120,31 +120,28 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
}
}
- // The Remoting Viewer plugin is built-in, but behind a flag for now.
+ // The Remoting Viewer plugin is built-in.
#if defined(ENABLE_REMOTING)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableRemoting)) {
- PepperPluginInfo info;
- info.is_internal = true;
- info.name = kRemotingViewerPluginName;
- info.path = FilePath(kRemotingViewerPluginPath);
- webkit::npapi::WebPluginMimeType remoting_mime_type(
- kRemotingViewerPluginMimeType,
- std::string(),
- std::string());
- info.mime_types.push_back(remoting_mime_type);
- webkit::npapi::WebPluginMimeType old_remoting_mime_type(
- kRemotingViewerPluginOldMimeType,
- std::string(),
- std::string());
- info.mime_types.push_back(old_remoting_mime_type);
- info.internal_entry_points.get_interface = remoting::PPP_GetInterface;
- info.internal_entry_points.initialize_module =
- remoting::PPP_InitializeModule;
- info.internal_entry_points.shutdown_module = remoting::PPP_ShutdownModule;
-
- plugins->push_back(info);
- }
+ PepperPluginInfo info;
+ info.is_internal = true;
+ info.name = kRemotingViewerPluginName;
+ info.path = FilePath(kRemotingViewerPluginPath);
+ webkit::npapi::WebPluginMimeType remoting_mime_type(
+ kRemotingViewerPluginMimeType,
+ std::string(),
+ std::string());
+ info.mime_types.push_back(remoting_mime_type);
+ webkit::npapi::WebPluginMimeType old_remoting_mime_type(
+ kRemotingViewerPluginOldMimeType,
+ std::string(),
+ std::string());
+ info.mime_types.push_back(old_remoting_mime_type);
+ info.internal_entry_points.get_interface = remoting::PPP_GetInterface;
+ info.internal_entry_points.initialize_module =
+ remoting::PPP_InitializeModule;
+ info.internal_entry_points.shutdown_module = remoting::PPP_ShutdownModule;
+
+ plugins->push_back(info);
#endif
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698