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

Unified Diff: chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc

Issue 782823002: Remove flag for Remote Assistance on Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Leave histogram unchanged for data decoding in older versions Created 6 years 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/about_flags.cc ('k') | extensions/common/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc
diff --git a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc
index 8dfb32c9afd5bcad591520b09f4ae9fbadb66147..1de8a2903649f52c729876d0e90d7e77976fef66 100644
--- a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc
+++ b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/command_line.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/location.h"
@@ -20,7 +19,6 @@
#include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h"
#include "components/policy/core/common/policy_service.h"
#include "extensions/common/constants.h"
-#include "extensions/common/switches.h"
#include "extensions/common/url_pattern.h"
#include "net/url_request/url_request_context_getter.h"
#include "remoting/host/chromoting_host_context.h"
@@ -96,19 +94,15 @@ struct BuiltInHost {
};
scoped_ptr<NativeMessageHost> CreateIt2MeHost() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableRemoteAssistance)) {
- scoped_ptr<remoting::It2MeHostFactory> host_factory(
- new remoting::It2MeHostFactory());
- host_factory->set_policy_service(g_browser_process->policy_service());
- scoped_ptr<remoting::ChromotingHostContext> context =
- remoting::ChromotingHostContext::CreateForChromeOS(
- make_scoped_refptr(g_browser_process->system_request_context()));
- scoped_ptr<NativeMessageHost> host(new remoting::It2MeNativeMessagingHost(
- context.Pass(), host_factory.Pass()));
- return host.Pass();
- }
- return nullptr;
+ scoped_ptr<remoting::It2MeHostFactory> host_factory(
+ new remoting::It2MeHostFactory());
+ host_factory->set_policy_service(g_browser_process->policy_service());
+ scoped_ptr<remoting::ChromotingHostContext> context =
+ remoting::ChromotingHostContext::CreateForChromeOS(
+ make_scoped_refptr(g_browser_process->system_request_context()));
+ scoped_ptr<NativeMessageHost> host(new remoting::It2MeNativeMessagingHost(
+ context.Pass(), host_factory.Pass()));
+ return host.Pass();
}
// If you modify the list of allowed_origins, don't forget to update
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | extensions/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698