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

Side by Side Diff: webkit/default_plugin/plugin_impl.h

Issue 18824: thread.cc race fix take 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__ 5 #ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__
6 #define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__ 6 #define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlwin.h> 9 #include <atlwin.h>
10 #include <string> 10 #include <string>
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 PluginInstallerState plugin_installer_state_; 343 PluginInstallerState plugin_installer_state_;
344 // Used to display the UI for plugin installation. 344 // Used to display the UI for plugin installation.
345 PluginInstallDialog install_dialog_; 345 PluginInstallDialog install_dialog_;
346 // To enable auto refresh of the plugin window once the installation 346 // To enable auto refresh of the plugin window once the installation
347 // is complete, we spawn the installation process in a job, and monitor 347 // is complete, we spawn the installation process in a job, and monitor
348 // IO completion events on the job. When the active process count of the 348 // IO completion events on the job. When the active process count of the
349 // job falls to zero, we initiate an auto refresh of the plugin list 349 // job falls to zero, we initiate an auto refresh of the plugin list
350 // which enables the downloaded plugin to be instantiated. 350 // which enables the downloaded plugin to be instantiated.
351 // The completion events from the job are monitored in an independent 351 // The completion events from the job are monitored in an independent
352 // thread. 352 // thread.
353 PluginInstallationJobMonitorThread installation_job_monitor_thread_; 353 scoped_refptr<PluginInstallationJobMonitorThread>
354 installation_job_monitor_thread_;
jeremy 2009/01/26 23:00:34 should be 4 spaces...
John Grabowski 2009/01/27 00:31:25 spaced.
354 // This object handles download and parsing of the plugins database. 355 // This object handles download and parsing of the plugins database.
355 PluginDatabaseHandler plugin_database_handler_; 356 PluginDatabaseHandler plugin_database_handler_;
356 // Indicates if the left click to download/refresh should be enabled or not. 357 // Indicates if the left click to download/refresh should be enabled or not.
357 bool enable_click_; 358 bool enable_click_;
358 // Handles to the fonts used to display text in the plugin window. 359 // Handles to the fonts used to display text in the plugin window.
359 HFONT bold_font_; 360 HFONT bold_font_;
360 HFONT regular_font_; 361 HFONT regular_font_;
361 HFONT underline_font_; 362 HFONT underline_font_;
362 // Tooltip Window. 363 // Tooltip Window.
363 HWND tooltip_; 364 HWND tooltip_;
364 // ActiveX related. 365 // ActiveX related.
365 std::string activex_codebase_; 366 std::string activex_codebase_;
366 std::string activex_clsid_; 367 std::string activex_clsid_;
367 CComObject<ActiveXInstaller>* activex_installer_; 368 CComObject<ActiveXInstaller>* activex_installer_;
368 369
369 DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl); 370 DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl);
370 }; 371 };
371 372
372 373
373 #endif // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__ 374 #endif // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_H__
374 375
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698