| Index: chrome/browser/prefs/incognito_mode_prefs.cc
|
| diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
|
| index e0255d4947d11a90c3d2e5fbbd56f707459c811b..06bb0e05d5e848c9f063a6e11820102b87f655e8 100644
|
| --- a/chrome/browser/prefs/incognito_mode_prefs.cc
|
| +++ b/chrome/browser/prefs/incognito_mode_prefs.cc
|
| @@ -7,25 +7,59 @@
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| #include "base/prefs/pref_service.h"
|
| +#include "base/threading/thread_restrictions.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| +#include "content/public/browser/browser_thread.h"
|
|
|
| #if defined(OS_WIN)
|
| -#include "base/win/metro.h"
|
| +#include <windows.h>
|
| +#include <wpcapi.h>
|
| +#include "base/win/scoped_comptr.h"
|
| +#include "base/win/windows_version.h"
|
| #endif // OS_WIN
|
|
|
| #if defined(OS_ANDROID)
|
| #include "chrome/browser/android/chromium_application.h"
|
| #endif // OS_ANDROID
|
|
|
| +using content::BrowserThread;
|
| +
|
| #if defined(OS_WIN)
|
| namespace {
|
|
|
| -bool g_parental_control_on = false;
|
| +// Returns true if Windows Parental control activity logging is enabled. This
|
| +// feature is available on Windows 7 and beyond. This function should be called
|
| +// on a COM Initialized thread and is potentially blocking.
|
| +bool IsParentalControlActivityLoggingOn() {
|
| + // Since we can potentially block, make sure the thread is okay with this.
|
| + base::ThreadRestrictions::AssertIOAllowed();
|
| + base::ThreadRestrictions::AssertWaitAllowed();
|
| +
|
| + // Query this info on Windows 7 and above.
|
| + if (base::win::GetVersion() < base::win::VERSION_WIN7)
|
| + return false;
|
| +
|
| + base::win::ScopedComPtr<IWindowsParentalControlsCore> parent_controls;
|
| + HRESULT hr = parent_controls.CreateInstance(
|
| + __uuidof(WindowsParentalControls));
|
| + if (FAILED(hr))
|
| + return false;
|
|
|
| -} // empty namespace
|
| + base::win::ScopedComPtr<IWPCSettings> settings;
|
| + hr = parent_controls->GetUserSettings(nullptr, settings.Receive());
|
| + if (FAILED(hr))
|
| + return false;
|
| +
|
| + unsigned long restrictions = 0;
|
| + settings->GetRestrictions(&restrictions);
|
| +
|
| + return (restrictions & WPCFLAG_LOGGING_REQUIRED) == WPCFLAG_LOGGING_REQUIRED;
|
| +}
|
| +
|
| +} // namespace
|
| #endif // OS_WIN
|
|
|
| // static
|
| @@ -104,25 +138,26 @@ bool IncognitoModePrefs::CanOpenBrowser(Profile* profile) {
|
| // static
|
| bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
|
| #if defined(OS_WIN)
|
| - // Disable incognito mode windows if parental controls are on. This is only
|
| - // for Windows Vista and above.
|
| - return base::win::IsParentalControlActivityLoggingOn();
|
| -#elif defined(OS_ANDROID)
|
| - return chrome::android::ChromiumApplication::AreParentalControlsEnabled();
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| -#if defined(OS_WIN)
|
| -void IncognitoModePrefs::InitializePlatformParentalControls() {
|
| - g_parental_control_on = base::win::IsParentalControlActivityLoggingOn();
|
| -}
|
| -#endif // OS_WIN
|
| -
|
| -bool IncognitoModePrefs::ArePlatformParentalControlsEnabledCached() {
|
| -#if defined(OS_WIN)
|
| - return g_parental_control_on;
|
| + enum class ParentalControlsState {
|
| + UNKNOWN = 0,
|
| + ACTIVITY_LOGGING_DISABLED = 1,
|
| + ACTIVITY_LOGGING_ENABLED = 2,
|
| + };
|
| + static ParentalControlsState parental_controls_state =
|
| + ParentalControlsState::UNKNOWN;
|
| + if (parental_controls_state == ParentalControlsState::UNKNOWN) {
|
| + // Production: The thread isn't initialized, so we're the only thread that
|
| + // should be able to update this.
|
| + // Test: The thread may be initialized, so check that it's the UI thread.
|
| + DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
|
| + BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| + parental_controls_state =
|
| + IsParentalControlActivityLoggingOn() ?
|
| + ParentalControlsState::ACTIVITY_LOGGING_ENABLED :
|
| + ParentalControlsState::ACTIVITY_LOGGING_DISABLED;
|
| + }
|
| + return parental_controls_state ==
|
| + ParentalControlsState::ACTIVITY_LOGGING_ENABLED;
|
| #elif defined(OS_ANDROID)
|
| return chrome::android::ChromiumApplication::AreParentalControlsEnabled();
|
| #else
|
|
|