OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/plugin/pepper_view.h" | 5 #include "remoting/client/plugin/pepper_view.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "ppapi/cpp/completion_callback.h" | 9 #include "ppapi/cpp/completion_callback.h" |
10 #include "ppapi/cpp/graphics_2d.h" | 10 #include "ppapi/cpp/graphics_2d.h" |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 ChromotingScriptableObject* scriptable_obj = instance_->GetScriptableObject(); | 231 ChromotingScriptableObject* scriptable_obj = instance_->GetScriptableObject(); |
232 switch (state) { | 232 switch (state) { |
233 case protocol::ConnectionToHost::CONNECTING: | 233 case protocol::ConnectionToHost::CONNECTING: |
234 SetSolidFill(kCreatedColor); | 234 SetSolidFill(kCreatedColor); |
235 scriptable_obj->SetConnectionStatus( | 235 scriptable_obj->SetConnectionStatus( |
236 ChromotingScriptableObject::STATUS_CONNECTING, | 236 ChromotingScriptableObject::STATUS_CONNECTING, |
237 ConvertConnectionError(error)); | 237 ConvertConnectionError(error)); |
238 break; | 238 break; |
239 | 239 |
240 case protocol::ConnectionToHost::CONNECTED: | 240 case protocol::ConnectionToHost::CONNECTED: |
241 break; | |
242 | |
243 case protocol::ConnectionToHost::AUTHENTICATED: | |
244 UnsetSolidFill(); | 241 UnsetSolidFill(); |
245 scriptable_obj->SetConnectionStatus( | 242 scriptable_obj->SetConnectionStatus( |
246 ChromotingScriptableObject::STATUS_CONNECTED, | 243 ChromotingScriptableObject::STATUS_CONNECTED, |
247 ConvertConnectionError(error)); | 244 ConvertConnectionError(error)); |
248 break; | 245 break; |
249 | 246 |
250 case protocol::ConnectionToHost::CLOSED: | 247 case protocol::ConnectionToHost::CLOSED: |
251 SetSolidFill(kDisconnectedColor); | 248 SetSolidFill(kDisconnectedColor); |
252 scriptable_obj->SetConnectionStatus( | 249 scriptable_obj->SetConnectionStatus( |
253 ChromotingScriptableObject::STATUS_CLOSED, | 250 ChromotingScriptableObject::STATUS_CLOSED, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 (base::Time::Now() - paint_start).InMilliseconds()); | 343 (base::Time::Now() - paint_start).InMilliseconds()); |
347 | 344 |
348 // If the last flush failed because there was already another one in progress | 345 // If the last flush failed because there was already another one in progress |
349 // then we perform the flush now. | 346 // then we perform the flush now. |
350 if (flush_blocked_) | 347 if (flush_blocked_) |
351 FlushGraphics(base::Time::Now()); | 348 FlushGraphics(base::Time::Now()); |
352 return; | 349 return; |
353 } | 350 } |
354 | 351 |
355 } // namespace remoting | 352 } // namespace remoting |
OLD | NEW |