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

Unified Diff: remoting/client/client_context.cc

Issue 7576005: Revert 95414 - Future proof against things like http://crbug.com/91521 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « remoting/client/client_context.h ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/client_context.cc
===================================================================
--- remoting/client/client_context.cc (revision 95414)
+++ remoting/client/client_context.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,15 +7,13 @@
#include <string>
#include "base/threading/thread.h"
-#include "remoting/client/plugin/pepper_util.h"
#include "remoting/jingle_glue/jingle_thread.h"
namespace remoting {
ClientContext::ClientContext()
: main_thread_("ChromotingClientMainThread"),
- decode_thread_("ChromotingClientDecodeThread"),
- started_(false) {
+ decode_thread_("ChromotingClientDecodeThread") {
}
ClientContext::~ClientContext() {
@@ -23,22 +21,16 @@
void ClientContext::Start() {
// Start all the threads.
- DCHECK(CurrentlyOnPluginThread());
main_thread_.Start();
decode_thread_.Start();
jingle_thread_.Start();
- started_ = true;
}
void ClientContext::Stop() {
- DCHECK(CurrentlyOnPluginThread());
- if (started_) {
- // Stop all the threads.
- jingle_thread_.Stop();
- decode_thread_.Stop();
- main_thread_.Stop();
- started_ = false;
- }
+ // Stop all the threads.
+ jingle_thread_.Stop();
+ decode_thread_.Stop();
+ main_thread_.Stop();
}
JingleThread* ClientContext::jingle_thread() {
« no previous file with comments | « remoting/client/client_context.h ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698