remoting/host/remoting_me2me_host.cc - Issue 10928017: Moving google_apis and GaiaClient to src/google_apis.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head Created 8 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:

Index: remoting/host/remoting_me2me_host.cc

diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc

index f7d90f85c37bbb4a32132a76d2ecfe8093fa27f0..10430aa889fd6ef494a9e344037ba3c0f6527fe7 100644

--- a/remoting/host/remoting_me2me_host.cc

+++ b/remoting/host/remoting_me2me_host.cc

@@ -22,8 +22,8 @@

#include "base/utf_string_conversions.h"

#include "base/win/windows_version.h"

#include "build/build_config.h"

-#include "chrome/common/net/google_apis/google_api_keys.h"

#include "crypto/nss_util.h"

+#include "google_apis/google_api_keys.h"

#include "ipc/ipc_channel.h"

#include "ipc/ipc_channel_proxy.h"

#include "net/base/network_change_notifier.h"

@@ -35,6 +35,7 @@

#include "remoting/host/chromoting_host.h"

#include "remoting/host/chromoting_host_context.h"

#include "remoting/host/chromoting_messages.h"

+#include "remoting/host/config_file_watcher.h"

#include "remoting/host/constants.h"

#include "remoting/host/config_file_watcher.h"

#include "remoting/host/desktop_environment_factory.h"

« no previous file with comments | « remoting/DEPS ('k') | remoting/remoting.gyp » ('j') | no next file with comments »