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

Side by Side Diff: chrome/browser/plugins/plugin_observer.h

Issue 2442953002: Remove stl_util's deletion function use from chrome/. (Closed)
Patch Set: fix Created 4 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
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
6 #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ 6 #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) 64 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
65 void OnRemovePluginPlaceholderHost(int placeholder_id); 65 void OnRemovePluginPlaceholderHost(int placeholder_id);
66 #endif 66 #endif
67 void RemoveComponentObserver(int placeholder_id); 67 void RemoveComponentObserver(int placeholder_id);
68 void OnOpenAboutPlugins(); 68 void OnOpenAboutPlugins();
69 void OnShowFlashPermissionBubble(); 69 void OnShowFlashPermissionBubble();
70 void OnCouldNotLoadPlugin(const base::FilePath& plugin_path); 70 void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
71 71
72 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) 72 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
73 // Stores all PluginPlaceholderHosts, keyed by their routing ID. 73 // Stores all PluginPlaceholderHosts, keyed by their routing ID.
74 std::map<int, PluginPlaceholderHost*> plugin_placeholders_; 74 std::map<int, std::unique_ptr<PluginPlaceholderHost>> plugin_placeholders_;
75 #endif 75 #endif
76 76
77 // Stores all ComponentObservers, keyed by their routing ID. 77 // Stores all ComponentObservers, keyed by their routing ID.
78 std::map<int, std::unique_ptr<ComponentObserver>> component_observers_; 78 std::map<int, std::unique_ptr<ComponentObserver>> component_observers_;
79 79
80 base::WeakPtrFactory<PluginObserver> weak_ptr_factory_; 80 base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(PluginObserver); 82 DISALLOW_COPY_AND_ASSIGN(PluginObserver);
83 }; 83 };
84 84
85 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ 85 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698