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

Side by Side Diff: remoting/client/plugin/pepper_view.cc

Issue 9860045: Address remaining nits for r129104. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/client/plugin/chromoting_instance.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <functional> 7 #include <functional>
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 case protocol::PEER_IS_OFFLINE: 44 case protocol::PEER_IS_OFFLINE:
45 return ChromotingInstance::ERROR_HOST_IS_OFFLINE; 45 return ChromotingInstance::ERROR_HOST_IS_OFFLINE;
46 46
47 case protocol::SESSION_REJECTED: 47 case protocol::SESSION_REJECTED:
48 case protocol::AUTHENTICATION_FAILED: 48 case protocol::AUTHENTICATION_FAILED:
49 return ChromotingInstance::ERROR_SESSION_REJECTED; 49 return ChromotingInstance::ERROR_SESSION_REJECTED;
50 50
51 case protocol::INCOMPATIBLE_PROTOCOL: 51 case protocol::INCOMPATIBLE_PROTOCOL:
52 return ChromotingInstance::ERROR_INCOMPATIBLE_PROTOCOL; 52 return ChromotingInstance::ERROR_INCOMPATIBLE_PROTOCOL;
53 53
54 case protocol::HOST_IS_DISABLED: 54 case protocol::HOST_OVERLOAD:
55 return ChromotingInstance::ERROR_HOST_IS_DISABLED; 55 return ChromotingInstance::ERROR_HOST_OVERLOAD;
56 56
57 case protocol::CHANNEL_CONNECTION_ERROR: 57 case protocol::CHANNEL_CONNECTION_ERROR:
58 case protocol::SIGNALING_ERROR: 58 case protocol::SIGNALING_ERROR:
59 case protocol::SIGNALING_TIMEOUT: 59 case protocol::SIGNALING_TIMEOUT:
60 case protocol::UNKNOWN_ERROR: 60 case protocol::UNKNOWN_ERROR:
61 return ChromotingInstance::ERROR_NETWORK_FAILURE; 61 return ChromotingInstance::ERROR_NETWORK_FAILURE;
62 } 62 }
63 DLOG(FATAL) << "Unknown error code" << error; 63 DLOG(FATAL) << "Unknown error code" << error;
64 return ChromotingInstance::ERROR_NONE; 64 return ChromotingInstance::ERROR_NONE;
65 } 65 }
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // Resume painting for the buffer that was previoulsy postponed because of 364 // Resume painting for the buffer that was previoulsy postponed because of
365 // pending flush. 365 // pending flush.
366 if (merge_buffer_ != NULL) { 366 if (merge_buffer_ != NULL) {
367 buffer = merge_buffer_; 367 buffer = merge_buffer_;
368 merge_buffer_ = NULL; 368 merge_buffer_ = NULL;
369 FlushBuffer(merge_clip_area_, buffer, merge_region_); 369 FlushBuffer(merge_clip_area_, buffer, merge_region_);
370 } 370 }
371 } 371 }
372 372
373 } // namespace remoting 373 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/plugin/chromoting_instance.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698