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

Side by Side Diff: chrome/browser/ui/views/location_bar/page_action_image_view.h

Issue 419023002: Move ShowPopup logic from BrowserActionsContainer to BrowserActionView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 preview_enabled_ = preview_enabled; 48 preview_enabled_ = preview_enabled;
49 } 49 }
50 50
51 // Overridden from views::View: 51 // Overridden from views::View:
52 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 52 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
53 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 53 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
54 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 54 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
55 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 55 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
56 56
57 // Overridden from ExtensionContextMenuModel::Delegate 57 // Overridden from ExtensionContextMenuModel::Delegate
58 virtual void InspectPopup(ExtensionAction* action) OVERRIDE; 58 virtual void InspectPopup() OVERRIDE;
59 59
60 // Overridden from views::WidgetObserver: 60 // Overridden from views::WidgetObserver:
61 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 61 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
62 62
63 // Overridden from views::ContextMenuController. 63 // Overridden from views::ContextMenuController.
64 virtual void ShowContextMenuForView(View* source, 64 virtual void ShowContextMenuForView(View* source,
65 const gfx::Point& point, 65 const gfx::Point& point,
66 ui::MenuSourceType source_type) OVERRIDE; 66 ui::MenuSourceType source_type) OVERRIDE;
67 67
68 // Overriden from ExtensionActionIconFactory::Observer. 68 // Overriden from ExtensionActionIconFactory::Observer.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // The extension command accelerator this page action is listening for (to 127 // The extension command accelerator this page action is listening for (to
128 // show the popup). 128 // show the popup).
129 scoped_ptr<ui::Accelerator> page_action_keybinding_; 129 scoped_ptr<ui::Accelerator> page_action_keybinding_;
130 130
131 scoped_ptr<views::MenuRunner> menu_runner_; 131 scoped_ptr<views::MenuRunner> menu_runner_;
132 132
133 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView); 133 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView);
134 }; 134 };
135 135
136 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ 136 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698