diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 00:55:32 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 00:55:32 +0000 |
| commit | 4d7840e27aedeaad417e6cc99f9e97d806fffa8c (patch) | |
| tree | 7d0cbd89c151b055376f56e3f2ef93877bed10ec /base/win | |
| parent | 31a8245f6712529bf88040fbab28e050cde4582c (diff) | |
| download | chromium_src-4d7840e27aedeaad417e6cc99f9e97d806fffa8c.zip chromium_src-4d7840e27aedeaad417e6cc99f9e97d806fffa8c.tar.gz chromium_src-4d7840e27aedeaad417e6cc99f9e97d806fffa8c.tar.bz2 | |
Removing the DCHECK for the thread type from the IsParentalControlActivityLoggingOn function in base\win as
this gets called in unit tests where we run with a default message pump. Added a note to that effect in the
header. This should work from the default thread as the COM object being loaded is an inproc server which
should work like a normal function call provided there is no marshaling. The object being invoked is
marked as dual, which should work correctly.
BUG=133560
R=jar
Review URL: https://chromiumcodereview.appspot.com/10702194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/metro.cc | 3 | ||||
| -rw-r--r-- | base/win/metro.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/base/win/metro.cc b/base/win/metro.cc index 58095e0..a8436cb 100644 --- a/base/win/metro.cc +++ b/base/win/metro.cc @@ -87,9 +87,6 @@ bool IsTouchEnabled() { } bool IsParentalControlActivityLoggingOn() { - DCHECK(MessageLoop::current() && - (MessageLoop::current()->type() == MessageLoop::TYPE_UI)); - // Query this info on Windows Vista and above. if (base::win::GetVersion() < base::win::VERSION_VISTA) return false; diff --git a/base/win/metro.h b/base/win/metro.h index efe70f9..899e8c4 100644 --- a/base/win/metro.h +++ b/base/win/metro.h @@ -64,7 +64,7 @@ BASE_EXPORT bool IsTouchEnabled(); // Returns true if Windows Parental control activity logging is enabled. This // feature is available on Windows Vista and beyond. -// Can only be called on the UI thread. +// This function should ideally be called on the UI thread. BASE_EXPORT bool IsParentalControlActivityLoggingOn(); } // namespace win |