Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2644)

Unified Diff: base/win/metro.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/metro.h ('k') | base/win/object_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/win/metro.cc
diff --git a/base/win/metro.cc b/base/win/metro.cc
index 6e443ba66b61a3747cc29cfb1f7f166320b6fd7d..794669803ca642939edfaf1cdbb874452f9c2808 100644
--- a/base/win/metro.cc
+++ b/base/win/metro.cc
@@ -4,10 +4,7 @@
#include "base/win/metro.h"
-#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
-#include "base/win/scoped_comptr.h"
-#include "base/win/windows_version.h"
namespace base {
namespace win {
@@ -73,38 +70,6 @@ wchar_t* LocalAllocAndCopyString(const string16& src) {
return dest;
}
-bool IsParentalControlActivityLoggingOn() {
- // Query this info on Windows 7 and above.
- if (base::win::GetVersion() < base::win::VERSION_WIN7)
- return false;
-
- static bool parental_control_logging_required = false;
- static bool parental_control_status_determined = false;
-
- if (parental_control_status_determined)
- return parental_control_logging_required;
-
- parental_control_status_determined = true;
-
- ScopedComPtr<IWindowsParentalControlsCore> parent_controls;
- HRESULT hr = parent_controls.CreateInstance(
- __uuidof(WindowsParentalControls));
- if (FAILED(hr))
- return false;
-
- ScopedComPtr<IWPCSettings> settings;
- hr = parent_controls->GetUserSettings(NULL, settings.Receive());
- if (FAILED(hr))
- return false;
-
- unsigned long restrictions = 0;
- settings->GetRestrictions(&restrictions);
-
- parental_control_logging_required =
- (restrictions & WPCFLAG_LOGGING_REQUIRED) == WPCFLAG_LOGGING_REQUIRED;
- return parental_control_logging_required;
-}
-
// Metro driver exports for getting the launch type, initial url, initial
// search term, etc.
extern "C" {
« no previous file with comments | « base/win/metro.h ('k') | base/win/object_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698