diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 19:50:13 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 19:50:13 +0000 |
| commit | b897ff873abc2344b8f46a2df7b4fad3881cf116 (patch) | |
| tree | 36a79fb905a5cd4f03d60d9051dce47d725ece1c /apps/app_restore_service.h | |
| parent | 7550b5a1d1fc1d4e62f06a935d2d615cdd8494e4 (diff) | |
| download | chromium_src-b897ff873abc2344b8f46a2df7b4fad3881cf116.zip chromium_src-b897ff873abc2344b8f46a2df7b4fad3881cf116.tar.gz chromium_src-b897ff873abc2344b8f46a2df7b4fad3881cf116.tar.bz2 | |
Revert 184900
I think this revert, oddly, caused a series of failures on chromeos bots
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20x64/builds/30936
like the top of the failures that it was supposed to have solved.
browser_tests browser_tests failed 3
Flakiness dashboard
( 44 mins, 15 secs )
stdio
FileSystemApiOpenBackgroundTest
FileSystemApiSaveBackgroundTest
FileAccessIsSavedToPrefs
Perhaps it wasn't the root cause after all.
This re-landing is an attempt to investigate what's going on here.
I reverted another change in the original blamelist an attempt to investigate further.
https://codereview.chromium.org/12334129/
I also tried disabling these tests to get more green in the tree. That hasn't kicked in yet, oddly.
https://codereview.chromium.org/12334128/
> Revert "Track and persist what file entries an extension has access to."
>
> This reverts commit 4fe61bc24f343a6a1381a782dec4fb45b2f6c437 (r184878).
>
> This was causing test failures in FileSystemApiOpenBackgroundTest and
> FileSystemApiSaveBackgroundTest on linux (example
> http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests%20%28dbg%29%281%29&number=23657 )
>
> TBR=koz@chromium.org
> BUG=
>
> Review URL: https://codereview.chromium.org/12319140
TBR=iannucci@chromium.org
Review URL: https://codereview.chromium.org/12317156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_restore_service.h')
| -rw-r--r-- | apps/app_restore_service.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/app_restore_service.h b/apps/app_restore_service.h index f919a7a..0217f60 100644 --- a/apps/app_restore_service.h +++ b/apps/app_restore_service.h @@ -11,12 +11,19 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -class Profile; - namespace extensions { class Extension; + +namespace app_file_handler_util { +struct SavedFileEntry; +} + } +class Profile; + +using extensions::app_file_handler_util::SavedFileEntry; + namespace apps { // Tracks what apps need to be restarted when the browser restarts. @@ -37,7 +44,9 @@ class AppRestoreService : public ProfileKeyedService, void RecordAppStart(const std::string& extension_id); void RecordAppStop(const std::string& extension_id); - void RestoreApp(const extensions::Extension* extension); + void RestoreApp( + const extensions::Extension* extension, + const std::vector<SavedFileEntry>& file_entries); content::NotificationRegistrar registrar_; Profile* profile_; |