diff options
author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 07:22:57 +0000 |
---|---|---|
committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 07:22:57 +0000 |
commit | 53795d06911da21970b1700ee2156937664e6af6 (patch) | |
tree | 172482d8ab16e72c5fc678b31cca338c7e60df13 /apps/app_restore_service.h | |
parent | 95ef3fe7cdd419bc218fc5f52b33f8a6325a7266 (diff) | |
download | chromium_src-53795d06911da21970b1700ee2156937664e6af6.zip chromium_src-53795d06911da21970b1700ee2156937664e6af6.tar.gz chromium_src-53795d06911da21970b1700ee2156937664e6af6.tar.bz2 |
Revert 199406 "Restart apps that don't listen to onRestarted() b..."
> Restart apps that don't listen to onRestarted() by sending them onLaunched().
>
> We only do this if the app had windows opened the last time it was running,
> otherwise apps that were running but had no windows may restart by opening
> windows, which manifests as apps coming back on a restart after the user
> already closed them.
>
> BUG=230667,167740,162057
>
> Review URL: https://chromiumcodereview.appspot.com/14878008
TBR=koz@chromium.org
Review URL: https://codereview.chromium.org/14711009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_restore_service.h')
-rw-r--r-- | apps/app_restore_service.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/apps/app_restore_service.h b/apps/app_restore_service.h index 287a21c..f27c83c 100644 --- a/apps/app_restore_service.h +++ b/apps/app_restore_service.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -30,8 +29,7 @@ namespace apps { // Tracks what apps need to be restarted when the browser restarts. class AppRestoreService : public ProfileKeyedService, - public content::NotificationObserver, - public extensions::ShellWindowRegistry::Observer { + public content::NotificationObserver { public: // Returns true if apps should be restored on the current platform, given // whether this new browser process launched due to a restart. @@ -49,18 +47,8 @@ class AppRestoreService : public ProfileKeyedService, const content::NotificationSource& source, const content::NotificationDetails& details) OVERRIDE; - // extensions::ShellWindowRegistry::Observer. - virtual void OnShellWindowAdded(ShellWindow* shell_window) OVERRIDE; - virtual void OnShellWindowIconChanged(ShellWindow* shell_window) OVERRIDE; - virtual void OnShellWindowRemoved(ShellWindow* shell_window) OVERRIDE; - - // ProfileKeyedService. - virtual void Shutdown() OVERRIDE; - void RecordAppStart(const std::string& extension_id); void RecordAppStop(const std::string& extension_id); - void RecordIfAppHasWindows(const std::string& id); - void RestoreApp( const extensions::Extension* extension, const std::vector<SavedFileEntry>& file_entries); |