Chromium Code Reviews| 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 031aa73aec5059680ff56bc8203bf1ac29982787..8eec0813eb46c85dc933fb5c9fcd10bf70cdb161 100644 |
| --- a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
| +++ b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc |
| @@ -17,7 +17,7 @@ |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "base/values.h" |
| #include "chrome/browser/browser_process.h" |
| -#include "chrome/browser/chromeos/arc/arc_support_host.h" |
| +#include "chrome/browser/chromeos/arc/ui/arc_support_message_host.h" |
| #include "components/policy/core/common/policy_service.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "extensions/common/constants.h" |
| @@ -129,18 +129,13 @@ const char* const kRemotingIt2MeOrigins[] = { |
| "chrome-extension://hpodccmdligbeohchckkeajbfohibipg/"}; |
| static const BuiltInHost kBuiltInHost[] = { |
| - {"com.google.chrome.test.echo", // ScopedTestNativeMessagingHost::kHostName |
| - kEchoHostOrigins, |
| - arraysize(kEchoHostOrigins), |
| - &EchoHost::Create}, |
| - {"com.google.chrome.remote_assistance", |
| - kRemotingIt2MeOrigins, |
| - arraysize(kRemotingIt2MeOrigins), |
| - &CreateIt2MeHost}, |
| - {ArcSupportHost::kHostName, |
| - ArcSupportHost::kHostOrigin, |
| - 1, |
| - &ArcSupportHost::Create}, |
| + {"com.google.chrome.test.echo", // ScopedTestNativeMessagingHost::kHostName |
|
hidehiko
2016/10/20 18:36:17
Note: this is the result of "git cl format".
|
| + kEchoHostOrigins, arraysize(kEchoHostOrigins), &EchoHost::Create}, |
| + {"com.google.chrome.remote_assistance", kRemotingIt2MeOrigins, |
| + arraysize(kRemotingIt2MeOrigins), &CreateIt2MeHost}, |
| + {arc::ArcSupportMessageHost::kHostName, |
| + arc::ArcSupportMessageHost::kHostOrigin, 1, |
| + &arc::ArcSupportMessageHost::Create}, |
| }; |
| bool MatchesSecurityOrigin(const BuiltInHost& host, |