diff options
| author | aberent <aberent@chromium.org> | 2016-03-24 07:48:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 14:50:16 +0000 |
| commit | 66cd00e2e4279f83be7e99935e417b2e2002d8f8 (patch) | |
| tree | 560179322817c29ed15f22e5cd0598d0e585492d /remoting/host/it2me | |
| parent | 3e33c0a4ad9c2a086373f2d47decc4b5c825c055 (diff) | |
| download | chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.zip chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.gz chromium_src-66cd00e2e4279f83be7e99935e417b2e2002d8f8.tar.bz2 | |
Revert of Move ServiceUrls to remoting/host (patchset #4 id:80001 of https://codereview.chromium.org/1817573003/ )
Reason for revert:
Breaks downstream Android ToT builds, and hence prevents Chromium changes rolling into downstream Android builds.
BUG= 597559
Original issue's description:
> Move ServiceUrls to remoting/host
>
> ServiceUrls was used only in one place in android client and it's
> not really useful there. Moved it to the host directory.
>
> TBR=rogerta@chromium.org
>
> Committed: https://crrev.com/2a2656a67bd2ce190df4d918f609bdb4449a64fe
> Cr-Commit-Position: refs/heads/master@{#382939}
TBR=lambroslambrou@chromium.org,rogerta@chromium.org,sergeyu@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1830993002
Cr-Commit-Position: refs/heads/master@{#383060}
Diffstat (limited to 'remoting/host/it2me')
| -rw-r--r-- | remoting/host/it2me/it2me_host.cc | 2 | ||||
| -rw-r--r-- | remoting/host/it2me/it2me_native_messaging_host.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc index 0d51b3f..08eb7e1 100644 --- a/remoting/host/it2me/it2me_host.cc +++ b/remoting/host/it2me/it2me_host.cc @@ -19,6 +19,7 @@ #include "remoting/base/chromium_url_request.h" #include "remoting/base/logging.h" #include "remoting/base/rsa_key_pair.h" +#include "remoting/base/service_urls.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/host_event_logger.h" @@ -28,7 +29,6 @@ #include "remoting/host/it2me_desktop_environment.h" #include "remoting/host/policy_watcher.h" #include "remoting/host/register_support_host_request.h" -#include "remoting/host/service_urls.h" #include "remoting/protocol/auth_util.h" #include "remoting/protocol/chromium_port_allocator_factory.h" #include "remoting/protocol/ice_transport.h" diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc index 87ecea8..424e8b8 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.cc +++ b/remoting/host/it2me/it2me_native_messaging_host.cc @@ -19,9 +19,9 @@ #include "build/build_config.h" #include "net/base/url_util.h" #include "net/url_request/url_request_context_getter.h" +#include "remoting/base/service_urls.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/host_exit_codes.h" -#include "remoting/host/service_urls.h" #include "remoting/protocol/name_value_map.h" namespace remoting { |