OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <set> | 5 #include <set> |
6 #include <vector> | 6 #include <vector> |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/json/json_string_value_serializer.h" | 8 #include "base/json/json_string_value_serializer.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 | 122 |
123 DISALLOW_COPY_AND_ASSIGN(KillActivityDatabaseErrorDelegate); | 123 DISALLOW_COPY_AND_ASSIGN(KillActivityDatabaseErrorDelegate); |
124 }; | 124 }; |
125 | 125 |
126 // ActivityLogFactory | 126 // ActivityLogFactory |
127 | 127 |
128 ActivityLogFactory* ActivityLogFactory::GetInstance() { | 128 ActivityLogFactory* ActivityLogFactory::GetInstance() { |
129 return Singleton<ActivityLogFactory>::get(); | 129 return Singleton<ActivityLogFactory>::get(); |
130 } | 130 } |
131 | 131 |
132 ProfileKeyedService* ActivityLogFactory::BuildServiceInstanceFor( | 132 BrowserContextKeyedService* ActivityLogFactory::BuildServiceInstanceFor( |
133 content::BrowserContext* profile) const { | 133 content::BrowserContext* profile) const { |
134 return new ActivityLog(static_cast<Profile*>(profile)); | 134 return new ActivityLog(static_cast<Profile*>(profile)); |
135 } | 135 } |
136 | 136 |
137 content::BrowserContext* ActivityLogFactory::GetBrowserContextToUse( | 137 content::BrowserContext* ActivityLogFactory::GetBrowserContextToUse( |
138 content::BrowserContext* context) const { | 138 content::BrowserContext* context) const { |
139 return chrome::GetBrowserContextRedirectedInIncognito(context); | 139 return chrome::GetBrowserContextRedirectedInIncognito(context); |
140 } | 140 } |
141 | 141 |
142 // ActivityLog | 142 // ActivityLog |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 return "content_script"; | 499 return "content_script"; |
500 case ActivityLog::ACTIVITY_EVENT_DISPATCH: | 500 case ActivityLog::ACTIVITY_EVENT_DISPATCH: |
501 return "event_dispatch"; | 501 return "event_dispatch"; |
502 default: | 502 default: |
503 NOTREACHED(); | 503 NOTREACHED(); |
504 return ""; | 504 return ""; |
505 } | 505 } |
506 } | 506 } |
507 | 507 |
508 } // namespace extensions | 508 } // namespace extensions |
OLD | NEW |