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

Unified Diff: Source/modules/presentation/PresentationSession.cpp

Issue 1209473003: Marks session as connected upon StartSession success (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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: Source/modules/presentation/PresentationSession.cpp
diff --git a/Source/modules/presentation/PresentationSession.cpp b/Source/modules/presentation/PresentationSession.cpp
index dc665e2de1d2b3cb544a6e93db4f90f33a80c907..0dfa0160360b2abb10e9af6e8d9eb0da93a6a15e 100644
--- a/Source/modules/presentation/PresentationSession.cpp
+++ b/Source/modules/presentation/PresentationSession.cpp
@@ -86,11 +86,11 @@ private:
FileReaderLoader m_loader;
};
-PresentationSession::PresentationSession(LocalFrame* frame, const String& id, const String& url)
+PresentationSession::PresentationSession(LocalFrame* frame, const String& id, const String& url, WebPresentationSessionState state)
: DOMWindowProperty(frame)
, m_id(id)
, m_url(url)
- , m_state(WebPresentationSessionState::Disconnected)
+ , m_state(state)
{
}
@@ -100,13 +100,13 @@ PresentationSession::~PresentationSession()
}
// static
-PresentationSession* PresentationSession::take(WebPresentationSessionClient* clientRaw, Presentation* presentation)
+PresentationSession* PresentationSession::take(WebPresentationSessionClient* clientRaw, Presentation* presentation, WebPresentationSessionState state)
{
ASSERT(clientRaw);
ASSERT(presentation);
OwnPtr<WebPresentationSessionClient> client = adoptPtr(clientRaw);
- PresentationSession* session = new PresentationSession(presentation->frame(), client->getId(), client->getUrl());
+ PresentationSession* session = new PresentationSession(presentation->frame(), client->getId(), client->getUrl(), state);
presentation->registerSession(session);
return session;
}

Powered by Google App Engine
This is Rietveld 408576698