diff options
Diffstat (limited to 'chrome/browser/extensions/activity_log')
12 files changed, 53 insertions, 53 deletions
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc index 40ef876..b653227 100644 --- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc @@ -53,10 +53,10 @@ class ActivityDatabaseTestPolicy : public ActivityDatabase::Delegate { virtual void Record(ActivityDatabase* db, scoped_refptr<Action> action); protected: - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection*) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE {} - virtual void OnDatabaseClose() OVERRIDE { delete this; } + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection*) override; + virtual void OnDatabaseFailure() override {} + virtual void OnDatabaseClose() override { delete this; } std::vector<scoped_refptr<Action> > queue_; }; @@ -107,7 +107,7 @@ void ActivityDatabaseTestPolicy::Record(ActivityDatabase* db, class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); @@ -117,7 +117,7 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { switches::kEnableExtensionActivityLogTesting); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h index 60145a7..02ebb7c 100644 --- a/chrome/browser/extensions/activity_log/activity_log.h +++ b/chrome/browser/extensions/activity_log/activity_log.h @@ -87,25 +87,25 @@ class ActivityLog : public BrowserContextKeyedAPI, // We keep track of whether the whitelisted extension is installed; if it is, // we want to recompute whether to have logging enabled. virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // ApiActivityMonitor. virtual void OnApiEventDispatched( const std::string& extension_id, const std::string& event_name, - scoped_ptr<base::ListValue> event_args) OVERRIDE; + scoped_ptr<base::ListValue> event_args) override; virtual void OnApiFunctionCalled( const std::string& extension_id, const std::string& api_name, - scoped_ptr<base::ListValue> event_args) OVERRIDE; + scoped_ptr<base::ListValue> event_args) override; static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); @@ -152,7 +152,7 @@ class ActivityLog : public BrowserContextKeyedAPI, virtual void OnScriptsExecuted( const content::WebContents* web_contents, const ExecutingScriptsMap& extension_ids, - const GURL& on_url) OVERRIDE; + const GURL& on_url) override; // At the moment, ActivityLog will use only one policy for summarization. // These methods are used to choose and set the most appropriate policy. diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc index 32a175e..26bf493a 100644 --- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc @@ -29,7 +29,7 @@ namespace extensions { class ActivityLogPrerenderTest : public ExtensionApiTest { protected: // Make sure the activity log is turned on. - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableExtensionActivityLogging); command_line->AppendSwitchASCII(switches::kPrerenderMode, diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc index ff831014..e701079 100644 --- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc @@ -28,14 +28,14 @@ const char* kExtensionID = "abjoigjokfeibfhiahiijggogladbmfm"; class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc index 2d5a530..57b803d 100644 --- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc @@ -56,7 +56,7 @@ namespace extensions { class ActivityLogTest : public ChromeRenderViewHostTestHarness { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); #if defined OS_CHROMEOS test_user_manager_.reset(new chromeos::ScopedTestUserManager()); @@ -72,7 +72,7 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { #if defined OS_CHROMEOS test_user_manager_.reset(); #endif diff --git a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc index 1a84629..a0a23eb 100644 --- a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc +++ b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc @@ -93,7 +93,7 @@ class ActivityLogObserver : public ActivityLog::Observer { bool found_multiple_injections() const { return found_multiple_injections_; } private: - virtual void OnExtensionActivity(scoped_refptr<Action> action) OVERRIDE; + virtual void OnExtensionActivity(scoped_refptr<Action> action) override; ScopedObserver<ActivityLog, ActivityLog::Observer> scoped_observer_; @@ -142,7 +142,7 @@ class TestAdNetworkDatabase : public AdNetworkDatabase { virtual ~TestAdNetworkDatabase(); private: - virtual bool IsAdNetwork(const GURL& url) const OVERRIDE; + virtual bool IsAdNetwork(const GURL& url) const override; GURL ad_network_url1_; GURL ad_network_url2_; @@ -173,8 +173,8 @@ class AdInjectionBrowserTest : public ExtensionBrowserTest { AdInjectionBrowserTest(); virtual ~AdInjectionBrowserTest(); - virtual void SetUpOnMainThread() OVERRIDE; - virtual void TearDownOnMainThread() OVERRIDE; + virtual void SetUpOnMainThread() override; + virtual void TearDownOnMainThread() override; // Handle the "Reset Begin" stage of the test. testing::AssertionResult HandleResetBeginStage(); diff --git a/chrome/browser/extensions/activity_log/counting_policy.h b/chrome/browser/extensions/activity_log/counting_policy.h index 2c77f16..57b6efa 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.h +++ b/chrome/browser/extensions/activity_log/counting_policy.h @@ -25,7 +25,7 @@ class CountingPolicy : public ActivityLogDatabasePolicy { explicit CountingPolicy(Profile* profile); virtual ~CountingPolicy(); - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; virtual void ReadFilteredData( const std::string& extension_id, @@ -35,9 +35,9 @@ class CountingPolicy : public ActivityLogDatabasePolicy { const std::string& arg_url, const int days_ago, const base::Callback - <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE; + <void(scoped_ptr<Action::ActionVector>)>& callback) override; - virtual void Close() OVERRIDE; + virtual void Close() override; // Gets or sets the amount of time that old records are kept in the database. const base::TimeDelta& retention_time() const { return retention_time_; } @@ -46,16 +46,16 @@ class CountingPolicy : public ActivityLogDatabasePolicy { } // Remove actions (rows) which IDs are specified in the action_ids array. - virtual void RemoveActions(const std::vector<int64>& action_ids) OVERRIDE; + virtual void RemoveActions(const std::vector<int64>& action_ids) override; // Clean the URL data stored for this policy. - virtual void RemoveURLs(const std::vector<GURL>&) OVERRIDE; + virtual void RemoveURLs(const std::vector<GURL>&) override; // Clean the data related to this extension for this policy. - virtual void RemoveExtensionData(const std::string& extension_id) OVERRIDE; + virtual void RemoveExtensionData(const std::string& extension_id) override; // Delete everything in the database. - virtual void DeleteDatabase() OVERRIDE; + virtual void DeleteDatabase() override; // The main database table, and the name for a read-only view that // decompresses string values for easier parsing. @@ -65,10 +65,10 @@ class CountingPolicy : public ActivityLogDatabasePolicy { protected: // The ActivityDatabase::Delegate interface. These are always called from // the database thread. - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection* db) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE; - virtual void OnDatabaseClose() OVERRIDE; + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection* db) override; + virtual void OnDatabaseFailure() override; + virtual void OnDatabaseClose() override; private: // A type used to track pending writes to the database. The key is an action diff --git a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc index 19908ca..961de8c 100644 --- a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc +++ b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc @@ -14,14 +14,14 @@ namespace extensions { class DatabaseStringTableTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); base::FilePath db_file = temp_dir_.path().AppendASCII("StringTable.db"); ASSERT_TRUE(db_.Open(db_file)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { db_.Close(); } diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h index 84e3491..cdcc446 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h @@ -26,7 +26,7 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { // For more info about these member functions, see the super class. explicit FullStreamUIPolicy(Profile* profile); - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; virtual void ReadFilteredData( const std::string& extension_id, @@ -36,21 +36,21 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { const std::string& arg_url, const int days_ago, const base::Callback - <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE; + <void(scoped_ptr<Action::ActionVector>)>& callback) override; - virtual void Close() OVERRIDE; + virtual void Close() override; // Remove the actions stored for this policy according to the passed IDs. - virtual void RemoveActions(const std::vector<int64>& action_ids) OVERRIDE; + virtual void RemoveActions(const std::vector<int64>& action_ids) override; // Clean the URL data stored for this policy. - virtual void RemoveURLs(const std::vector<GURL>& restrict_urls) OVERRIDE; + virtual void RemoveURLs(const std::vector<GURL>& restrict_urls) override; // Clean the data related to this extension for this policy. - virtual void RemoveExtensionData(const std::string& extension_id) OVERRIDE; + virtual void RemoveExtensionData(const std::string& extension_id) override; // Delete everything in the database. - virtual void DeleteDatabase() OVERRIDE; + virtual void DeleteDatabase() override; // Database table schema. static const char* kTableName; @@ -65,10 +65,10 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy { // The ActivityDatabase::Delegate interface. These are always called from // the database thread. - virtual bool InitDatabase(sql::Connection* db) OVERRIDE; - virtual bool FlushDatabase(sql::Connection* db) OVERRIDE; - virtual void OnDatabaseFailure() OVERRIDE; - virtual void OnDatabaseClose() OVERRIDE; + virtual bool InitDatabase(sql::Connection* db) override; + virtual bool FlushDatabase(sql::Connection* db) override; + virtual void OnDatabaseFailure() override; + virtual void OnDatabaseClose() override; // Strips arguments if needed by policy. May return the original object (if // unmodified), or a copy (if modifications were made). The implementation diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h index b542246..c3dad05 100644 --- a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h +++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h @@ -23,7 +23,7 @@ class HashedAdNetworkDatabase : public AdNetworkDatabase { private: // AdNetworkDatabase implementation. - virtual bool IsAdNetwork(const GURL& url) const OVERRIDE; + virtual bool IsAdNetwork(const GURL& url) const override; // Points to the array of hash entries. In practice, this is always set to // kHashedAdNetworks, but is exposed via set_entries_for_testing(). diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc index 6c9f89d..9dae73c 100644 --- a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc +++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc @@ -30,7 +30,7 @@ const size_t kNumAdNetworkHosts = arraysize(kAdNetworkHosts); class HashedAdNetworkDatabaseUnitTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; AdNetworkDatabase* database() { return database_.get(); } diff --git a/chrome/browser/extensions/activity_log/uma_policy.h b/chrome/browser/extensions/activity_log/uma_policy.h index 29d41db..c534f62 100644 --- a/chrome/browser/extensions/activity_log/uma_policy.h +++ b/chrome/browser/extensions/activity_log/uma_policy.h @@ -56,8 +56,8 @@ class UmaPolicy : public ActivityLogPolicy, explicit UmaPolicy(Profile* profile); // ActivityLogPolicy implementation. - virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE; - virtual void Close() OVERRIDE; + virtual void ProcessAction(scoped_refptr<Action> action) override; + virtual void Close() override; // Gets the histogram name associated with each PageStatus. static const char* GetHistogramName(PageStatus status); @@ -77,19 +77,19 @@ class UmaPolicy : public ActivityLogPolicy, typedef std::map<std::string, ExtensionMap> SiteMap; // BrowserListObserver - virtual void OnBrowserAdded(Browser* browser) OVERRIDE; - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; + virtual void OnBrowserAdded(Browser* browser) override; + virtual void OnBrowserRemoved(Browser* browser) override; // TabStripModelObserver // Fired when a page loads, either as a new tab or replacing the contents of // an older tab. virtual void TabChangedAt(content::WebContents* contents, int index, - TabChangeType change_type) OVERRIDE; + TabChangeType change_type) override; // Fired when a tab closes. virtual void TabClosingAt(TabStripModel* tab_strip_model, content::WebContents* contents, - int index) OVERRIDE; + int index) override; // Assign a status bitmask based on the action's properties. int MatchActionToStatus(scoped_refptr<Action> action); |