Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2017)

Unified Diff: chrome/browser/extensions/api/sessions/sessions_api.h

Issue 21022018: Sessions API - previously Session Restore API. Supports restoring currently open foreign windows an… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/sessions/sessions_api.h
diff --git a/chrome/browser/extensions/api/session_restore/session_restore_api.h b/chrome/browser/extensions/api/sessions/sessions_api.h
similarity index 24%
rename from chrome/browser/extensions/api/session_restore/session_restore_api.h
rename to chrome/browser/extensions/api/sessions/sessions_api.h
index 37ab15eb1f5be393fdf7c584069d204684ce6b6a..207b6e22b038c990458221e5c8fb085cad0d8282 100644
--- a/chrome/browser/extensions/api/session_restore/session_restore_api.h
+++ b/chrome/browser/extensions/api/sessions/sessions_api.h
@@ -1,61 +1,101 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_API_SESSION_RESTORE_SESSION_RESTORE_API_H__
-#define CHROME_BROWSER_EXTENSIONS_API_SESSION_RESTORE_SESSION_RESTORE_API_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
+#define CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__
+
+#include <string>
#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
#include "chrome/browser/extensions/extension_function.h"
#include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/common/extensions/api/session_restore.h"
+#include "chrome/browser/sessions/tab_restore_service_observer.h"
+#include "chrome/common/extensions/api/sessions.h"
#include "chrome/common/extensions/api/tabs.h"
#include "chrome/common/extensions/api/windows.h"
class Profile;
+namespace browser_sync {
+struct SyncedSession;
+}
+
namespace extensions {
-class SessionRestoreGetRecentlyClosedFunction : public SyncExtensionFunction {
+class ForeignSessionId;
+
+class SessionsGetRecentlyClosedFunction : public SyncExtensionFunction {
protected:
- virtual ~SessionRestoreGetRecentlyClosedFunction() {}
+ virtual ~SessionsGetRecentlyClosedFunction() {}
virtual bool RunImpl() OVERRIDE;
- DECLARE_EXTENSION_FUNCTION("sessionRestore.getRecentlyClosed",
- SESSIONRESTORE_GETRECENTLYCLOSED)
+ DECLARE_EXTENSION_FUNCTION("sessions.getRecentlyClosed",
+ SESSIONS_GETRECENTLYCLOSED)
private:
- scoped_ptr<api::tabs::Tab> CreateTabModel(
- const TabRestoreService::Tab& tab, int selected_index);
+ scoped_ptr<api::tabs::Tab> CreateTabModel(const TabRestoreService::Tab& tab,
+ int session_id,
+ int selected_index);
scoped_ptr<api::windows::Window> CreateWindowModel(
- const TabRestoreService::Window& window);
- scoped_ptr<api::session_restore::ClosedEntry> CreateEntryModel(
+ const TabRestoreService::Window& window,
+ int session_id);
+ scoped_ptr<api::sessions::Session> CreateSessionModel(
const TabRestoreService::Entry* entry);
};
-class SessionRestoreRestoreFunction : public SyncExtensionFunction {
+class SessionsGetDevicesFunction : public SyncExtensionFunction {
+ protected:
+ virtual ~SessionsGetDevicesFunction() {}
+ virtual bool RunImpl() OVERRIDE;
+ DECLARE_EXTENSION_FUNCTION("sessions.getDevices", SESSIONS_GETDEVICES)
+
+ private:
+ scoped_ptr<api::tabs::Tab> CreateTabModel(const std::string& session_tag,
+ const SessionTab& tab,
+ int tab_index,
+ int selected_index);
+ scoped_ptr<api::windows::Window> CreateWindowModel(
+ const SessionWindow& window,
+ const std::string& session_tag);
+ scoped_ptr<api::sessions::Session> CreateSessionModel(
+ const SessionWindow& window,
+ const std::string& session_tag);
+ scoped_ptr<api::sessions::Device> CreateDeviceModel(
+ const browser_sync::SyncedSession* session);
+};
+
+class SessionsRestoreFunction : public SyncExtensionFunction {
protected:
- virtual ~SessionRestoreRestoreFunction() {}
+ virtual ~SessionsRestoreFunction() {}
virtual bool RunImpl() OVERRIDE;
- DECLARE_EXTENSION_FUNCTION("sessionRestore.restore", SESSIONRESTORE_RESTORE)
+ DECLARE_EXTENSION_FUNCTION("sessions.restore", SESSIONS_RESTORE)
+
+ private:
+ void SetResultRestoredTab(const content::WebContents* contents);
+ bool SetResultRestoredWindow(int window_id);
+ bool RestoreMostRecentlyClosed(Browser* browser);
+ bool RestoreLocalSession(int id, Browser* browser);
+ bool RestoreForeignSession(const ForeignSessionId* fs_id,
+ Browser* browser);
};
-class SessionRestoreAPI : public ProfileKeyedAPI {
+class SessionsAPI : public ProfileKeyedAPI {
public:
- explicit SessionRestoreAPI(Profile* profile);
- virtual ~SessionRestoreAPI();
+ explicit SessionsAPI(Profile* profile);
+ virtual ~SessionsAPI();
// ProfileKeyedAPI implementation.
- static ProfileKeyedAPIFactory<SessionRestoreAPI>* GetFactoryInstance();
+ static ProfileKeyedAPIFactory<SessionsAPI>* GetFactoryInstance();
private:
- friend class ProfileKeyedAPIFactory<SessionRestoreAPI>;
+ friend class ProfileKeyedAPIFactory<SessionsAPI>;
// ProfileKeyedAPI implementation.
static const char* service_name() {
- return "SessionRestoreAPI";
+ return "SessionsAPI";
}
static const bool kServiceIsNULLWhileTesting = true;
};
} // namespace extensions
-#endif // CHROME_BROWSER_EXTENSIONS_API_SESSION_RESTORE_SESSION_RESTORE_API_H__
+#endif // CHROME_BROWSER_EXTENSIONS_API_SESSIONS_SESSIONS_API_H__

Powered by Google App Engine
This is Rietveld 408576698