X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Ffirst_run%2Ffirst_run.cc;h=8ee4f657255a3cf279e95c720aa200ed8c7a4844;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=0646f90ab44f412e7a22d729c1c3e18c8107a2c8;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/first_run/first_run.cc b/src/chrome/browser/first_run/first_run.cc index 0646f90..8ee4f65 100644 --- a/src/chrome/browser/first_run/first_run.cc +++ b/src/chrome/browser/first_run/first_run.cc @@ -86,13 +86,13 @@ bool g_should_do_autofill_personal_data_manager_first_run = false; class ImportEndedObserver : public importer::ImporterProgressObserver { public: ImportEndedObserver() : ended_(false) {} - virtual ~ImportEndedObserver() {} + ~ImportEndedObserver() override {} // importer::ImporterProgressObserver: - virtual void ImportStarted() OVERRIDE {} - virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {} - virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {} - virtual void ImportEnded() OVERRIDE { + void ImportStarted() override {} + void ImportItemStarted(importer::ImportItem item) override {} + void ImportItemEnded(importer::ImportItem item) override {} + void ImportEnded() override { ended_ = true; if (!callback_for_import_end_.is_null()) callback_for_import_end_.Run(); @@ -134,9 +134,9 @@ class FirstRunDelayedTasks : public content::NotificationObserver { content::NotificationService::AllSources()); } - virtual void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE { + void Observe(int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) override { // After processing the notification we always delete ourselves. if (type == extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED) { Profile* profile = content::Source(source).ptr(); @@ -149,7 +149,7 @@ class FirstRunDelayedTasks : public content::NotificationObserver { private: // Private ctor forces it to be created only in the heap. - virtual ~FirstRunDelayedTasks() {} + ~FirstRunDelayedTasks() override {} // The extension work is to basically trigger an extension update check. // If the extension specified in the master pref is older than the live @@ -311,12 +311,12 @@ class FirstRunBubbleLauncher : public content::NotificationObserver { private: FirstRunBubbleLauncher(); - virtual ~FirstRunBubbleLauncher(); + ~FirstRunBubbleLauncher() override; // content::NotificationObserver: - virtual void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + void Observe(int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) override; content::NotificationRegistrar registrar_;