remoting/host/policy_hack/policy_watcher.cc - Issue 10873050: [Chromoting] Hook up host talkgadget policy checks.

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/policy_hack/policy_watcher.cc

Issue 10873050: [Chromoting] Hook up host talkgadget policy checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change int to bool Created 8 years, 4 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/policy_hack/policy_watcher.cc

diff --git a/remoting/host/policy_hack/policy_watcher.cc b/remoting/host/policy_hack/policy_watcher.cc

index 270bccbb06eb154b6a4ecbbcd5935ed78b257d2e..bfa83f44420afe987d9c5d5f5a9fcb4d9298939b 100644

--- a/remoting/host/policy_hack/policy_watcher.cc

+++ b/remoting/host/policy_hack/policy_watcher.cc

@@ -15,7 +15,7 @@

#include "base/synchronization/waitable_event.h"

#include "base/time.h"

#include "base/values.h"

-#include "remoting/host/constants.h"

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

namespace remoting {

namespace policy_hack {

@@ -96,7 +96,8 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary(

PolicyWatcher::kHostDomainPolicyName, "", "");

CopyStringOrDefault(to.get(), from,

PolicyWatcher::kHostTalkGadgetPrefixPolicyName,

- kDefaultTalkGadgetPrefix, kDefaultTalkGadgetPrefix);

+ kDefaultHostTalkGadgetPrefix,

+ kDefaultHostTalkGadgetPrefix);

CopyBooleanOrDefault(to.get(), from,

PolicyWatcher::kHostRequireCurtainPolicyName,

false, false);