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

Side by Side Diff: plugin/cross/o3d_glue.cc

Issue 155276: Add ClientInfo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 5 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 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 Client *GetClient(NPP npp) { 91 Client *GetClient(NPP npp) {
92 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata); 92 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata);
93 return plugin_object->client(); 93 return plugin_object->client();
94 } 94 }
95 95
96 PluginObject::PluginObject(NPP npp) 96 PluginObject::PluginObject(NPP npp)
97 : npp_(npp), 97 : npp_(npp),
98 evaluation_counter_(&service_locator_), 98 evaluation_counter_(&service_locator_),
99 class_manager_(&service_locator_), 99 class_manager_(&service_locator_),
100 client_info_manager_(&service_locator_),
100 object_manager_(&service_locator_), 101 object_manager_(&service_locator_),
101 profiler_(&service_locator_), 102 profiler_(&service_locator_),
102 fullscreen_(false), 103 fullscreen_(false),
103 renderer_(NULL), 104 renderer_(NULL),
104 features_(NULL), 105 features_(NULL),
105 fullscreen_region_valid_(false), 106 fullscreen_region_valid_(false),
106 renderer_init_status_(Renderer::UNINITIALIZED), 107 renderer_init_status_(Renderer::UNINITIALIZED),
107 #ifdef OS_WIN 108 #ifdef OS_WIN
108 hWnd_(NULL), 109 hWnd_(NULL),
109 fullscreen_hWnd_(NULL), 110 fullscreen_hWnd_(NULL),
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata); 879 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata);
879 if (plugin_object) { // May not be initialized yet. 880 if (plugin_object) { // May not be initialized yet.
880 return plugin_object->client()->ProfileToString(); 881 return plugin_object->client()->ProfileToString();
881 } else { 882 } else {
882 return ""; 883 return "";
883 } 884 }
884 } 885 }
885 886
886 } // namespace globals 887 } // namespace globals
887 } // namespace glue 888 } // namespace glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698