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

Side by Side Diff: components/renderer_context_menu/render_view_context_menu_base.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_ 5 #ifndef COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
6 #define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_ 6 #define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 content::ContextMenuParams params_; 171 content::ContextMenuParams params_;
172 content::WebContents* const source_web_contents_; 172 content::WebContents* const source_web_contents_;
173 content::BrowserContext* const browser_context_; 173 content::BrowserContext* const browser_context_;
174 174
175 ui::SimpleMenuModel menu_model_; 175 ui::SimpleMenuModel menu_model_;
176 176
177 // Renderer's frame id. 177 // Renderer's frame id.
178 const int render_frame_id_; 178 const int render_frame_id_;
179 179
180 // Our observers. 180 // Our observers.
181 mutable ObserverList<RenderViewContextMenuObserver> observers_; 181 mutable base::ObserverList<RenderViewContextMenuObserver> observers_;
182 182
183 // Whether a command has been executed. Used to track whether menu observers 183 // Whether a command has been executed. Used to track whether menu observers
184 // should be notified of menu closing without execution. 184 // should be notified of menu closing without execution.
185 bool command_executed_; 185 bool command_executed_;
186 186
187 scoped_ptr<ContextMenuContentType> content_type_; 187 scoped_ptr<ContextMenuContentType> content_type_;
188 188
189 private: 189 private:
190 bool AppendCustomItems(); 190 bool AppendCustomItems();
191 191
192 // The RenderFrameHost's IDs. 192 // The RenderFrameHost's IDs.
193 const int render_process_id_; 193 const int render_process_id_;
194 194
195 scoped_ptr<ToolkitDelegate> toolkit_delegate_; 195 scoped_ptr<ToolkitDelegate> toolkit_delegate_;
196 196
197 DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuBase); 197 DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuBase);
198 }; 198 };
199 199
200 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_ 200 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
OLDNEW
« no previous file with comments | « components/proximity_auth/screenlock_bridge.h ('k') | components/search_engines/template_url_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698