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

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

Issue 8676038: Revert 111519 - Remove default plug-in on Mac, Gtk and Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « chrome/default_plugin/plugin_impl_gtk.cc ('k') | chrome/default_plugin/plugin_impl_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // Plugin icon, weak (owned by ResourceBundle). 286 // Plugin icon, weak (owned by ResourceBundle).
287 NSImage* image_; 287 NSImage* image_;
288 // Displayed text 288 // Displayed text
289 NSString* command_; 289 NSString* command_;
290 290
291 DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl); 291 DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
292 }; 292 };
293 293
294 294
295 #endif // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_ 295 #endif // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
OLDNEW
« no previous file with comments | « chrome/default_plugin/plugin_impl_gtk.cc ('k') | chrome/default_plugin/plugin_impl_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698