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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_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_ZOOM_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/ui/toolbar/toolbar_model.h" 9 #include "chrome/browser/ui/toolbar/toolbar_model.h"
10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
(...skipping 24 matching lines...) Expand all
35 // as needed. 35 // as needed.
36 void Update(); 36 void Update();
37 37
38 private: 38 private:
39 // views::ImageView: 39 // views::ImageView:
40 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 40 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
41 virtual bool GetTooltipText(const gfx::Point& p, 41 virtual bool GetTooltipText(const gfx::Point& p,
42 string16* tooltip) const OVERRIDE; 42 string16* tooltip) const OVERRIDE;
43 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 43 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
44 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 44 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
45 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 45 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
46 46
47 // Toolbar model used to test whether location bar input is in progress. 47 // Toolbar model used to test whether location bar input is in progress.
48 ToolbarModel* toolbar_model_; 48 ToolbarModel* toolbar_model_;
49 49
50 // The delegate used to get the currently visible TabContents. 50 // The delegate used to get the currently visible TabContents.
51 LocationBarView::Delegate* location_bar_delegate_; 51 LocationBarView::Delegate* location_bar_delegate_;
52 52
53 // The current icon state. 53 // The current icon state.
54 ZoomController::ZoomIconState zoom_icon_state_; 54 ZoomController::ZoomIconState zoom_icon_state_;
55 55
56 // The current zoom percentage. 56 // The current zoom percentage.
57 int zoom_percent_; 57 int zoom_percent_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(ZoomView); 59 DISALLOW_COPY_AND_ASSIGN(ZoomView);
60 }; 60 };
61 61
62 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_VIEW_H_ 62 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/star_view.cc ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698