summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 10:57:11 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 10:57:11 +0000
commit0a3d2194bad2e44c91bc82a0a4a4d1c78a27de60 (patch)
treeb41272347ea2f1ee74129cea6f1f42323535e664
parentfc9be58014b3967f0e37d1745db1b17d8dfd071c (diff)
downloadchromium_src-0a3d2194bad2e44c91bc82a0a4a4d1c78a27de60.zip
chromium_src-0a3d2194bad2e44c91bc82a0a4a4d1c78a27de60.tar.gz
chromium_src-0a3d2194bad2e44c91bc82a0a4a4d1c78a27de60.tar.bz2
ProfileInfoCacheObserver: All methods now have a default empty implementation.
Previously they were pure virtual. Removed all empty overrides of ProfileInfoCacheObserver methods, as they are no longer necessary. BUG=247570 Review URL: https://chromiumcodereview.appspot.com/16035013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205488 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/background/background_mode_manager.cc9
-rw-r--r--chrome/browser/background/background_mode_manager.h4
-rw-r--r--chrome/browser/profiles/profile_info_cache_observer.h10
-rw-r--r--chrome/browser/profiles/profile_manager_browsertest.cc8
-rw-r--r--chrome/browser/profiles/profile_shortcut_manager_win.cc4
-rw-r--r--chrome/browser/profiles/profile_shortcut_manager_win.h2
-rw-r--r--chrome/browser/ui/app_list/app_list_service_impl.cc11
-rw-r--r--chrome/browser/ui/app_list/app_list_service_impl.h7
-rw-r--r--chrome/browser/ui/browser_command_controller.cc13
-rw-r--r--chrome/browser/ui/browser_command_controller.h5
10 files changed, 5 insertions, 68 deletions
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 644f75f..e6a0b96 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -435,11 +435,6 @@ void BackgroundModeManager::OnProfileWillBeRemoved(
}
}
-void BackgroundModeManager::OnProfileWasRemoved(
- const base::FilePath& profile_path,
- const string16& profile_name) {
-}
-
void BackgroundModeManager::OnProfileNameChanged(
const base::FilePath& profile_path,
const string16& old_profile_name) {
@@ -458,10 +453,6 @@ void BackgroundModeManager::OnProfileNameChanged(
}
}
-void BackgroundModeManager::OnProfileAvatarChanged(
- const base::FilePath& profile_path) {
-
-}
///////////////////////////////////////////////////////////////////////////////
// BackgroundModeManager::BackgroundModeData, ui::SimpleMenuModel overrides
bool BackgroundModeManager::IsCommandIdChecked(
diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h
index 07cdc50..1600cd1 100644
--- a/chrome/browser/background/background_mode_manager.h
+++ b/chrome/browser/background/background_mode_manager.h
@@ -169,12 +169,8 @@ class BackgroundModeManager
virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
virtual void OnProfileWillBeRemoved(
const base::FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
- const string16& profile_name) OVERRIDE;
virtual void OnProfileNameChanged(const base::FilePath& profile_path,
const string16& old_profile_name) OVERRIDE;
- virtual void OnProfileAvatarChanged(
- const base::FilePath& profile_path) OVERRIDE;
// Overrides from SimpleMenuModel::Delegate implementation.
virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
diff --git a/chrome/browser/profiles/profile_info_cache_observer.h b/chrome/browser/profiles/profile_info_cache_observer.h
index 9cc7f77..1342185 100644
--- a/chrome/browser/profiles/profile_info_cache_observer.h
+++ b/chrome/browser/profiles/profile_info_cache_observer.h
@@ -18,13 +18,13 @@ class ProfileInfoCacheObserver {
public:
virtual ~ProfileInfoCacheObserver() {}
- virtual void OnProfileAdded(const base::FilePath& profile_path) = 0;
- virtual void OnProfileWillBeRemoved(const base::FilePath& profile_path) = 0;
+ virtual void OnProfileAdded(const base::FilePath& profile_path) {}
+ virtual void OnProfileWillBeRemoved(const base::FilePath& profile_path) {}
virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
- const string16& profile_name) = 0;
+ const string16& profile_name) {}
virtual void OnProfileNameChanged(const base::FilePath& profile_path,
- const string16& old_profile_name) = 0;
- virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) = 0;
+ const string16& old_profile_name) {}
+ virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) {}
protected:
ProfileInfoCacheObserver() {}
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 44db016..7b96cc4 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -51,19 +51,11 @@ class ProfileRemovalObserver : public ProfileInfoCacheObserver {
std::string last_used_profile_name() { return last_used_profile_name_; }
// ProfileInfoCacheObserver overrides:
- virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE {}
virtual void OnProfileWillBeRemoved(
const base::FilePath& profile_path) OVERRIDE {
last_used_profile_name_ = g_browser_process->local_state()->GetString(
prefs::kProfileLastUsed);
}
- virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
- const string16& profile_name) OVERRIDE {}
- virtual void OnProfileNameChanged(const base::FilePath& profile_path,
- const string16& old_profile_name)
- OVERRIDE {}
- virtual void OnProfileAvatarChanged(const base::FilePath& profile_path)
- OVERRIDE {}
private:
std::string last_used_profile_name_;
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
index 57dca5e..abfb1d6 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -612,10 +612,6 @@ void ProfileShortcutManagerWin::OnProfileAdded(
}
}
-void ProfileShortcutManagerWin::OnProfileWillBeRemoved(
- const base::FilePath& profile_path) {
-}
-
void ProfileShortcutManagerWin::OnProfileWasRemoved(
const base::FilePath& profile_path,
const string16& profile_name) {
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h
index 631a713..fa627a4 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.h
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.h
@@ -56,8 +56,6 @@ class ProfileShortcutManagerWin : public ProfileShortcutManager,
// ProfileInfoCacheObserver implementation:
virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWillBeRemoved(
- const base::FilePath& profile_path) OVERRIDE;
virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
const string16& profile_name) OVERRIDE;
virtual void OnProfileNameChanged(const base::FilePath& profile_path,
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.cc b/chrome/browser/ui/app_list/app_list_service_impl.cc
index be8f90d..f04b303 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl.cc
@@ -137,17 +137,6 @@ AppListControllerDelegate* AppListServiceImpl::CreateControllerDelegate() {
void AppListServiceImpl::OnSigninStatusChanged() {}
-void AppListServiceImpl::OnProfileAdded(const base::FilePath& profilePath) {}
-
-void AppListServiceImpl::OnProfileWasRemoved(
- const base::FilePath& profile_path, const string16& profile_name) {}
-
-void AppListServiceImpl::OnProfileNameChanged(
- const base::FilePath& profile_path, const string16& profile_name) {}
-
-void AppListServiceImpl::OnProfileAvatarChanged(
- const base::FilePath& profile_path) {}
-
// We need to watch for profile removal to keep kAppListProfile updated.
void AppListServiceImpl::OnProfileWillBeRemoved(
const base::FilePath& profile_path) {
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.h b/chrome/browser/ui/app_list/app_list_service_impl.h
index 40c6c08..91909cc 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.h
+++ b/chrome/browser/ui/app_list/app_list_service_impl.h
@@ -78,15 +78,8 @@ class AppListServiceImpl : public AppListService,
virtual Profile* GetCurrentAppListProfile() OVERRIDE;
// ProfileInfoCacheObserver overrides:
- virtual void OnProfileAdded(const base::FilePath& profilePath) OVERRIDE;
virtual void OnProfileWillBeRemoved(
const base::FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
- const string16& profile_name) OVERRIDE;
- virtual void OnProfileNameChanged(const base::FilePath& profile_path,
- const string16& profile_name) OVERRIDE;
- virtual void OnProfileAvatarChanged(
- const base::FilePath& profile_path) OVERRIDE;
// content::NotificationObserver
virtual void Observe(int type,
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 3579b2b..c5d34be 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -721,19 +721,6 @@ void BrowserCommandController::OnProfileWasRemoved(
UpdateCommandsForMultipleProfiles();
}
-void BrowserCommandController::OnProfileWillBeRemoved(
- const base::FilePath& profile_path) {
-}
-
-void BrowserCommandController::OnProfileNameChanged(
- const base::FilePath& profile_path,
- const string16& old_profile_name) {
-}
-
-void BrowserCommandController::OnProfileAvatarChanged(
- const base::FilePath& profile_path) {
-}
-
////////////////////////////////////////////////////////////////////////////////
// BrowserCommandController, SigninPrefObserver implementation:
diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
index 37b5e18..7c6a8d4 100644
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -98,13 +98,8 @@ class BrowserCommandController : public CommandUpdaterDelegate,
// Overridden from ProfileInfoCacheObserver:
virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
- virtual void OnProfileWillBeRemoved(
- const base::FilePath& profile_path) OVERRIDE;
virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
const string16& profile_name) OVERRIDE;
- virtual void OnProfileNameChanged(const base::FilePath& profile_path,
- const string16& old_profile_name) OVERRIDE;
- virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) OVERRIDE;
// Overridden from TabStripModelObserver:
virtual void TabInsertedAt(content::WebContents* contents,