summaryrefslogtreecommitdiffstats
path: root/chrome/browser/managed_mode/managed_user_service.h
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 22:49:14 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 22:49:14 +0000
commit89d9b38895a1cf9a9205683118da437c72c274d1 (patch)
tree3504c2b17d82dc3efe3e0cbcbb1692b06fc0ec77 /chrome/browser/managed_mode/managed_user_service.h
parentb207f138e3d77069754507e7b037451f92570266 (diff)
downloadchromium_src-89d9b38895a1cf9a9205683118da437c72c274d1.zip
chromium_src-89d9b38895a1cf9a9205683118da437c72c274d1.tar.gz
chromium_src-89d9b38895a1cf9a9205683118da437c72c274d1.tar.bz2
Revert 210422 "This CL adds logic to record some events about a ..."
Speculative revert for failing unit_tests: [ RUN ] PageCyclerTest.FailProvisionalLoads Received signal 11 <unknown> 000000000000 [0x7fb1ee68fd7e] base::debug::StackTrace::StackTrace() [0x7fb1ee68f8b7] base::debug::(anonymous namespace)::StackDumpSignalHandler() [0x7fb1df7dbcb0] <unknown> [0x0000037db713] BrowserList::AddBrowser() [0x0000037bf0ef] Browser::Browser() [0x000001d9a7bf] BrowserWithTestWindowTest::SetUp() [0x000000fc8838] PageCyclerTest::SetUp() [0x0000037763b3] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x00000376d27e] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000003764d73] testing::Test::Run() [0x0000037654cb] testing::TestInfo::Run() [0x000003765a67] testing::TestCase::Run() [0x000003769d95] testing::internal::UnitTestImpl::RunAllTests() [0x000003773473] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x00000376e72e] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000003769a84] testing::UnitTest::Run() [0x000004536baf] base::TestSuite::Run() [0x0000043e292d] content::UnitTestTestSuite::Run() [0x0000041bec64] main [0x7fb1dd40876d] __libc_start_main [0x0000004fe659] <unknown> r8: 00007fff4ce909c0 r9: 00007fff4ce909a0 r10: 00007fff4ce90a40 r11: 0000000000000246 r12: 000016465163bfb0 r13: 0000000000000000 r14: 0000000006315e30 r15: 0000000006315be8 di: 0000000000000000 si: 0000164655cbe6b0 bp: 00007fff4ce91070 bx: 0000000006315e68 dx: 0000000000000001 ax: 0000164655ff6360 cx: 3636363636363636 sp: 00007fff4ce90e70 ip: 00000000037db713 efl: 0000000000010206 cgf: 0000000000000033 erf: 0000000000000000 trp: 000000000000000d msk: 0000000000000000 cr2: 0000000000000000 > This CL adds logic to record some events about a managed user that may be useful to the custodian. > > These events are: > 1- Opening of a managed user profile. > 2- Switching from a managed user profile to any other profile. > 3- Quitting the browser. > > > BUG=None > > Review URL: https://chromiumcodereview.appspot.com/18023017 TBR=ibraaaa@google.com Review URL: https://codereview.chromium.org/18856008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/managed_mode/managed_user_service.h')
-rw-r--r--chrome/browser/managed_mode/managed_user_service.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h
index 125dc42..3bcc321 100644
--- a/chrome/browser/managed_mode/managed_user_service.h
+++ b/chrome/browser/managed_mode/managed_user_service.h
@@ -41,8 +41,7 @@ class PrefRegistrySyncable;
class ManagedUserService : public BrowserContextKeyedService,
public extensions::ManagementPolicy::Provider,
public ProfileSyncServiceObserver,
- public content::NotificationObserver,
- public chrome::BrowserListObserver {
+ public content::NotificationObserver {
public:
typedef std::vector<string16> CategoryList;
@@ -157,9 +156,6 @@ class ManagedUserService : public BrowserContextKeyedService,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // chrome::BrowserListObserver implementation:
- virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
-
private:
friend class ManagedUserServiceExtensionTest;
@@ -226,12 +222,6 @@ class ManagedUserService : public BrowserContextKeyedService,
// corresponding preference is changed.
void UpdateManualURLs();
- // Records some events (opening the managed user profile, switching from the
- // managed user profile, and quitting the browser); each is stored
- // using a key with a prefix (|key_prefix|) indicating the type of the event.
- // Each entry is a dictionary which has the timestamp of the event.
- void RecordProfileAndBrowserEventsHelper(const char* key_prefix);
-
base::WeakPtrFactory<ManagedUserService> weak_ptr_factory_;
// Owns us via the BrowserContextKeyedService mechanism.
@@ -242,7 +232,6 @@ class ManagedUserService : public BrowserContextKeyedService,
// True iff we're waiting for the Sync service to be initialized.
bool waiting_for_sync_initialization_;
- bool is_profile_active_;
// Sets a profile in elevated state for testing if set to true.
bool elevated_for_testing_;