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

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.h

Issue 9968076: Remove Inspect Popup command from browser actions. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Views compile failure Created 8 years, 8 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 (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_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 // The label's default requisition (cached so we can animate accordingly). 213 // The label's default requisition (cached so we can animate accordingly).
214 GtkRequisition label_req_; 214 GtkRequisition label_req_;
215 215
216 base::WeakPtrFactory<ContentSettingImageViewGtk> weak_factory_; 216 base::WeakPtrFactory<ContentSettingImageViewGtk> weak_factory_;
217 217
218 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk); 218 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk);
219 }; 219 };
220 220
221 class PageActionViewGtk : public ImageLoadingTracker::Observer, 221 class PageActionViewGtk : public ImageLoadingTracker::Observer,
222 public content::NotificationObserver, 222 public content::NotificationObserver {
223 public ExtensionContextMenuModel::PopupDelegate {
224 public: 223 public:
225 PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action); 224 PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action);
226 virtual ~PageActionViewGtk(); 225 virtual ~PageActionViewGtk();
227 226
228 GtkWidget* widget() { return event_box_.get(); } 227 GtkWidget* widget() { return event_box_.get(); }
229 228
230 ExtensionAction* page_action() { return page_action_; } 229 ExtensionAction* page_action() { return page_action_; }
231 230
232 void set_preview_enabled(bool preview_enabled) { 231 void set_preview_enabled(bool preview_enabled) {
233 preview_enabled_ = preview_enabled; 232 preview_enabled_ = preview_enabled;
(...skipping 12 matching lines...) Expand all
246 int index) OVERRIDE; 245 int index) OVERRIDE;
247 246
248 // Simulate left mouse click on the page action button. 247 // Simulate left mouse click on the page action button.
249 void TestActivatePageAction(); 248 void TestActivatePageAction();
250 249
251 // Implement the content::NotificationObserver interface. 250 // Implement the content::NotificationObserver interface.
252 virtual void Observe(int type, 251 virtual void Observe(int type,
253 const content::NotificationSource& source, 252 const content::NotificationSource& source,
254 const content::NotificationDetails& details) OVERRIDE; 253 const content::NotificationDetails& details) OVERRIDE;
255 254
256 // Overridden from ExtensionContextMenuModel::PopupDelegate:
257 virtual void InspectPopup(ExtensionAction* action) OVERRIDE;
258
259 private: 255 private:
260 // Show the popup for this page action. If |devtools| is true, show it 256 // Show the popup for this page action. Returns true if a popup was shown.
261 // with a debugger window attached. Returns true if a popup was shown. 257 bool ShowPopup();
262 bool ShowPopup(bool devtools);
263 258
264 // Connect the accelerator for the page action popup. 259 // Connect the accelerator for the page action popup.
265 void ConnectPageActionAccelerator(); 260 void ConnectPageActionAccelerator();
266 261
267 // Disconnect the accelerator for the page action popup. 262 // Disconnect the accelerator for the page action popup.
268 void DisconnectPageActionAccelerator(); 263 void DisconnectPageActionAccelerator();
269 264
270 CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnButtonPressed, 265 CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnButtonPressed,
271 GdkEventButton*); 266 GdkEventButton*);
272 CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnExposeEvent, 267 CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnExposeEvent,
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 // The last search keyword that was shown via the |tab_to_search_box_|. 493 // The last search keyword that was shown via the |tab_to_search_box_|.
499 string16 last_keyword_; 494 string16 last_keyword_;
500 495
501 // Used to change the visibility of the star decoration. 496 // Used to change the visibility of the star decoration.
502 BooleanPrefMember edit_bookmarks_enabled_; 497 BooleanPrefMember edit_bookmarks_enabled_;
503 498
504 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 499 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
505 }; 500 };
506 501
507 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 502 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698