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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.h

Issue 8295023: Move PPB/PPP_MouseLock out of dev/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts. Created 9 years, 2 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
OLDNEW
1 // -*- c++ -*- 1 // -*- c++ -*-
2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
3 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
4 // found in the LICENSE file. 4 // found in the LICENSE file.
5 5
6 // The portable representation of an instance and root scriptable object. 6 // The portable representation of an instance and root scriptable object.
7 // The PPAPI version of the plugin instantiates a subclass of this class. 7 // The PPAPI version of the plugin instantiates a subclass of this class.
8 8
9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
(...skipping 26 matching lines...) Expand all
37 struct NaClSrpcChannel; 37 struct NaClSrpcChannel;
38 struct NaClDesc; 38 struct NaClDesc;
39 39
40 namespace nacl { 40 namespace nacl {
41 class DescWrapper; 41 class DescWrapper;
42 class DescWrapperFactory; 42 class DescWrapperFactory;
43 } // namespace nacl 43 } // namespace nacl
44 44
45 namespace pp { 45 namespace pp {
46 class Find_Dev; 46 class Find_Dev;
47 class MouseLock_Dev; 47 class MouseLock;
48 class Printing_Dev; 48 class Printing_Dev;
49 class Selection_Dev; 49 class Selection_Dev;
50 class URLLoader; 50 class URLLoader;
51 class URLUtil_Dev; 51 class URLUtil_Dev;
52 class WidgetClient_Dev; 52 class WidgetClient_Dev;
53 class Zoom_Dev; 53 class Zoom_Dev;
54 } 54 }
55 55
56 namespace ppapi_proxy { 56 namespace ppapi_proxy {
57 class BrowserPpp; 57 class BrowserPpp;
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 // Keep track of file descriptors opened by StreamAsFile(). 525 // Keep track of file descriptors opened by StreamAsFile().
526 // These are owned by the browser. 526 // These are owned by the browser.
527 std::map<nacl::string, int32_t> url_fd_map_; 527 std::map<nacl::string, int32_t> url_fd_map_;
528 528
529 // Pending progress events. 529 // Pending progress events.
530 std::queue<ProgressEvent*> progress_events_; 530 std::queue<ProgressEvent*> progress_events_;
531 531
532 // Adapter class constructors require a reference to 'this', so we can't 532 // Adapter class constructors require a reference to 'this', so we can't
533 // contain them directly. 533 // contain them directly.
534 nacl::scoped_ptr<pp::Find_Dev> find_adapter_; 534 nacl::scoped_ptr<pp::Find_Dev> find_adapter_;
535 nacl::scoped_ptr<pp::MouseLock_Dev> mouse_lock_adapter_; 535 nacl::scoped_ptr<pp::MouseLock> mouse_lock_adapter_;
536 nacl::scoped_ptr<pp::Printing_Dev> printing_adapter_; 536 nacl::scoped_ptr<pp::Printing_Dev> printing_adapter_;
537 nacl::scoped_ptr<pp::Selection_Dev> selection_adapter_; 537 nacl::scoped_ptr<pp::Selection_Dev> selection_adapter_;
538 nacl::scoped_ptr<pp::WidgetClient_Dev> widget_client_adapter_; 538 nacl::scoped_ptr<pp::WidgetClient_Dev> widget_client_adapter_;
539 nacl::scoped_ptr<pp::Zoom_Dev> zoom_adapter_; 539 nacl::scoped_ptr<pp::Zoom_Dev> zoom_adapter_;
540 540
541 // Used for NexeFileDidOpenContinuation 541 // Used for NexeFileDidOpenContinuation
542 int64_t load_start_; 542 int64_t load_start_;
543 543
544 int64_t init_time_; 544 int64_t init_time_;
545 int64_t ready_time_; 545 int64_t ready_time_;
546 size_t nexe_size_; 546 size_t nexe_size_;
547 547
548 static void UpdateNexeDownloadProgress( 548 static void UpdateNexeDownloadProgress(
549 PP_Instance pp_instance, 549 PP_Instance pp_instance,
550 PP_Resource pp_resource, 550 PP_Resource pp_resource,
551 int64_t bytes_sent, 551 int64_t bytes_sent,
552 int64_t total_bytes_to_be_sent, 552 int64_t total_bytes_to_be_sent,
553 int64_t bytes_received, 553 int64_t bytes_received,
554 int64_t total_bytes_to_be_received); 554 int64_t total_bytes_to_be_received);
555 555
556 int64_t last_event_bytes_received_; 556 int64_t last_event_bytes_received_;
557 }; 557 };
558 558
559 } // namespace plugin 559 } // namespace plugin
560 560
561 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 561 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/upcall_server.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698