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

Side by Side Diff: chrome/default_plugin/plugin_impl_mac.h

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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) 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 #ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_ 5 #ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
6 #define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_ 6 #define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 NPP instance_; 278 NPP instance_;
279 // The current stream. 279 // The current stream.
280 NPStream* plugin_install_stream_; 280 NPStream* plugin_install_stream_;
281 // The desired mime type. 281 // The desired mime type.
282 std::string mime_type_; 282 std::string mime_type_;
283 // The current state of the plugin installer. 283 // The current state of the plugin installer.
284 PluginInstallerState plugin_installer_state_; 284 PluginInstallerState plugin_installer_state_;
285 // Dimensions of the plugin 285 // Dimensions of the plugin
286 uint32_t width_; 286 uint32_t width_;
287 uint32_t height_; 287 uint32_t height_;
288 // Plugin icon 288 // Plugin icon, weak (owned by ResourceBundle).
TVL 2011/02/18 21:19:12 this seems dangerous, why not just retain it so it
Robert Sesek 2011/02/18 21:48:17 That's probably never going to happen. ResourceBun
289 NSImage* image_; 289 NSImage* image_;
290 // Displayed text 290 // Displayed text
291 NSString* command_; 291 NSString* command_;
292 292
293 DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl); 293 DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
294 }; 294 };
295 295
296 296
297 #endif // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_ 297 #endif // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698