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

Side by Side Diff: remoting/client/plugin/chromoting_instance.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.h ('k') | remoting/client/plugin/pepper_view.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/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 case ChromotingInstance::ERROR_NONE: 72 case ChromotingInstance::ERROR_NONE:
73 return "NONE"; 73 return "NONE";
74 case ChromotingInstance::ERROR_HOST_IS_OFFLINE: 74 case ChromotingInstance::ERROR_HOST_IS_OFFLINE:
75 return "HOST_IS_OFFLINE"; 75 return "HOST_IS_OFFLINE";
76 case ChromotingInstance::ERROR_SESSION_REJECTED: 76 case ChromotingInstance::ERROR_SESSION_REJECTED:
77 return "SESSION_REJECTED"; 77 return "SESSION_REJECTED";
78 case ChromotingInstance::ERROR_INCOMPATIBLE_PROTOCOL: 78 case ChromotingInstance::ERROR_INCOMPATIBLE_PROTOCOL:
79 return "INCOMPATIBLE_PROTOCOL"; 79 return "INCOMPATIBLE_PROTOCOL";
80 case ChromotingInstance::ERROR_NETWORK_FAILURE: 80 case ChromotingInstance::ERROR_NETWORK_FAILURE:
81 return "NETWORK_FAILURE"; 81 return "NETWORK_FAILURE";
82 case ChromotingInstance::ERROR_HOST_IS_DISABLED: 82 case ChromotingInstance::ERROR_HOST_OVERLOAD:
83 return "HOST_IS_DISABLED"; 83 return "HOST_OVERLOAD";
84 } 84 }
85 NOTREACHED(); 85 NOTREACHED();
86 return ""; 86 return "";
87 } 87 }
88 88
89 } // namespace 89 } // namespace
90 90
91 // This flag blocks LOGs to the UI if we're already in the middle of logging 91 // This flag blocks LOGs to the UI if we're already in the middle of logging
92 // to the UI. This prevents a potential infinite loop if we encounter an error 92 // to the UI. This prevents a potential infinite loop if we encounter an error
93 // while sending the log message to the UI. 93 // while sending the log message to the UI.
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); 536 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
537 data->SetString("message", message); 537 data->SetString("message", message);
538 PostChromotingMessage("logDebugMessage", data.Pass()); 538 PostChromotingMessage("logDebugMessage", data.Pass());
539 539
540 scriptable_object->LogDebugInfo(message); 540 scriptable_object->LogDebugInfo(message);
541 } 541 }
542 g_logging_to_plugin = false; 542 g_logging_to_plugin = false;
543 } 543 }
544 544
545 } // namespace remoting 545 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/plugin/chromoting_instance.h ('k') | remoting/client/plugin/pepper_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698