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

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

Issue 2802011: Fix up build on Mac. Needed to initialize member vars. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_plugin.h" 5 #include "remoting/client/plugin/chromoting_plugin.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/thread.h" 11 #include "base/thread.h"
12 #include "remoting/client/chromoting_client.h" 12 #include "remoting/client/chromoting_client.h"
13 #include "remoting/client/host_connection.h" 13 #include "remoting/client/host_connection.h"
14 #include "remoting/client/jingle_host_connection.h" 14 #include "remoting/client/jingle_host_connection.h"
15 #include "remoting/client/plugin/pepper_view.h" 15 #include "remoting/client/plugin/pepper_view.h"
16 #include "remoting/jingle_glue/jingle_thread.h" 16 #include "remoting/jingle_glue/jingle_thread.h"
17 17
18 using std::string; 18 using std::string;
19 using std::vector; 19 using std::vector;
20 20
21 namespace remoting { 21 namespace remoting {
22 22
23 const char* ChromotingPlugin::kMimeType = 23 const char* ChromotingPlugin::kMimeType =
24 "pepper-application/x-chromoting-plugin::Chromoting"; 24 "pepper-application/x-chromoting-plugin::Chromoting";
25 25
26 ChromotingPlugin::ChromotingPlugin(NPNetscapeFuncs* browser_funcs, 26 ChromotingPlugin::ChromotingPlugin(NPNetscapeFuncs* browser_funcs,
27 NPP instance) 27 NPP instance)
28 : PepperPlugin(browser_funcs, instance) { 28 : PepperPlugin(browser_funcs, instance), width_(0), height_(0),
29 device_(NULL) {
29 } 30 }
30 31
31 ChromotingPlugin::~ChromotingPlugin() { 32 ChromotingPlugin::~ChromotingPlugin() {
32 } 33 }
33 34
34 NPError ChromotingPlugin::New(NPMIMEType pluginType, 35 NPError ChromotingPlugin::New(NPMIMEType pluginType,
35 int16 argc, char* argn[], char* argv[]) { 36 int16 argc, char* argn[], char* argv[]) {
36 LOG(INFO) << "Started ChromotingPlugin::New"; 37 LOG(INFO) << "Started ChromotingPlugin::New";
37 38
38 // Verify the mime type and subtype 39 // Verify the mime type and subtype
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 pos = parts[2].rfind('='); 187 pos = parts[2].rfind('=');
187 if (pos == string::npos && (pos + 1) != string::npos) { 188 if (pos == string::npos && (pos + 1) != string::npos) {
188 return false; 189 return false;
189 } 190 }
190 host_jid->assign(parts[2].substr(pos + 1)); 191 host_jid->assign(parts[2].substr(pos + 1));
191 192
192 return true; 193 return true;
193 } 194 }
194 195
195 } // namespace remoting 196 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698