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

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

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 int current_tab_id() { return current_tab_id_; } 45 int current_tab_id() { return current_tab_id_; }
46 46
47 void set_preview_enabled(bool preview_enabled) { 47 void set_preview_enabled(bool preview_enabled) {
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::AccessibleViewState* state) OVERRIDE; 52 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
53 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 53 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
54 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 54 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
55 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 55 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
56 56
57 // Overridden from ImageLoadingTracker: 57 // Overridden from ImageLoadingTracker:
58 virtual void OnImageLoaded(const gfx::Image& image, 58 virtual void OnImageLoaded(const gfx::Image& image,
59 const std::string& extension_id, 59 const std::string& extension_id,
60 int index) OVERRIDE; 60 int index) OVERRIDE;
61 61
62 // Overridden from views::WidgetObserver: 62 // Overridden from views::WidgetObserver:
63 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 63 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
64 64
65 // Overridden from views::ContextMenuController. 65 // Overridden from views::ContextMenuController.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 scoped_ptr<views::MenuRunner> menu_runner_; 137 scoped_ptr<views::MenuRunner> menu_runner_;
138 138
139 // Fade-in animation for the icon with observer scoped to this. 139 // Fade-in animation for the icon with observer scoped to this.
140 ExtensionAction::IconAnimation::ScopedObserver 140 ExtensionAction::IconAnimation::ScopedObserver
141 scoped_icon_animation_observer_; 141 scoped_icon_animation_observer_;
142 142
143 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView); 143 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView);
144 }; 144 };
145 145
146 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ 146 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698