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

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

Issue 931073002: Fix for Incomplete context menu shown in PDF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 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
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 bool IsCustomItemChecked(int id) const; 156 bool IsCustomItemChecked(int id) const;
157 bool IsCustomItemEnabled(int id) const; 157 bool IsCustomItemEnabled(int id) const;
158 158
159 // Opens the specified URL string in a new tab. 159 // Opens the specified URL string in a new tab.
160 void OpenURL(const GURL& url, const GURL& referrer, 160 void OpenURL(const GURL& url, const GURL& referrer,
161 WindowOpenDisposition disposition, 161 WindowOpenDisposition disposition,
162 ui::PageTransition transition); 162 ui::PageTransition transition);
163 163
164 content::ContextMenuParams params_; 164 content::ContextMenuParams params_;
165 content::WebContents* source_web_contents_; 165 content::WebContents* source_web_contents_;
166 content::WebContents* embedded_web_contents_;
raymes 2015/02/19 00:20:46 This should be called embedder_web_contents_. Ple
166 content::BrowserContext* browser_context_; 167 content::BrowserContext* browser_context_;
167 168
168 ui::SimpleMenuModel menu_model_; 169 ui::SimpleMenuModel menu_model_;
169 170
170 // Renderer's frame id. 171 // Renderer's frame id.
171 int render_frame_id_; 172 int render_frame_id_;
172 173
173 // Our observers. 174 // Our observers.
174 mutable ObserverList<RenderViewContextMenuObserver> observers_; 175 mutable ObserverList<RenderViewContextMenuObserver> observers_;
175 176
176 // Whether a command has been executed. Used to track whether menu observers 177 // Whether a command has been executed. Used to track whether menu observers
177 // should be notified of menu closing without execution. 178 // should be notified of menu closing without execution.
178 bool command_executed_; 179 bool command_executed_;
179 180
180 scoped_ptr<ContextMenuContentType> content_type_; 181 scoped_ptr<ContextMenuContentType> content_type_;
181 182
182 private: 183 private:
183 bool AppendCustomItems(); 184 bool AppendCustomItems();
184 185
185 // The RenderFrameHost's IDs. 186 // The RenderFrameHost's IDs.
186 int render_process_id_; 187 int render_process_id_;
187 188
188 scoped_ptr<ToolkitDelegate> toolkit_delegate_; 189 scoped_ptr<ToolkitDelegate> toolkit_delegate_;
189 190
190 DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuBase); 191 DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuBase);
191 }; 192 };
192 193
193 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_ 194 #endif // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698