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

Side by Side Diff: ui/app_list/app_list_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
« no previous file with comments | « content/shell/shell_aura.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_APP_LIST_APP_LIST_VIEW_H_ 5 #ifndef UI_APP_LIST_APP_LIST_VIEW_H_
6 #define UI_APP_LIST_APP_LIST_VIEW_H_ 6 #define UI_APP_LIST_APP_LIST_VIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/app_list/app_list_export.h" 9 #include "ui/app_list/app_list_export.h"
10 #include "ui/app_list/search_box_view_delegate.h" 10 #include "ui/app_list/search_box_view_delegate.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 private: 48 private:
49 // Creates models to use. 49 // Creates models to use.
50 void CreateModel(); 50 void CreateModel();
51 51
52 // Overridden from views::WidgetDelegateView: 52 // Overridden from views::WidgetDelegateView:
53 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 53 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
54 virtual bool HasHitTestMask() const OVERRIDE; 54 virtual bool HasHitTestMask() const OVERRIDE;
55 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 55 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
56 56
57 // Overridden from views::View: 57 // Overridden from views::View:
58 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 58 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
59 59
60 // Overridden from views::ButtonListener: 60 // Overridden from views::ButtonListener:
61 virtual void ButtonPressed(views::Button* sender, 61 virtual void ButtonPressed(views::Button* sender,
62 const views::Event& event) OVERRIDE; 62 const views::Event& event) OVERRIDE;
63 63
64 // Overridden from views::BubbleDelegate: 64 // Overridden from views::BubbleDelegate:
65 virtual gfx::Rect GetBubbleBounds() OVERRIDE; 65 virtual gfx::Rect GetBubbleBounds() OVERRIDE;
66 66
67 // Overridden from SearchBoxViewDelegate: 67 // Overridden from SearchBoxViewDelegate:
68 virtual void QueryChanged(SearchBoxView* sender) OVERRIDE; 68 virtual void QueryChanged(SearchBoxView* sender) OVERRIDE;
69 69
70 // Overridden from SearchResultListViewDelegate: 70 // Overridden from SearchResultListViewDelegate:
71 virtual void OpenResult(const SearchResult& result, 71 virtual void OpenResult(const SearchResult& result,
72 int event_flags) OVERRIDE; 72 int event_flags) OVERRIDE;
73 73
74 scoped_ptr<AppListModel> model_; 74 scoped_ptr<AppListModel> model_;
75 scoped_ptr<AppListViewDelegate> delegate_; 75 scoped_ptr<AppListViewDelegate> delegate_;
76 76
77 AppListBubbleBorder* bubble_border_; // Owned by views hierarchy. 77 AppListBubbleBorder* bubble_border_; // Owned by views hierarchy.
78 SearchBoxView* search_box_view_; // Owned by views hierarchy. 78 SearchBoxView* search_box_view_; // Owned by views hierarchy.
79 ContentsView* contents_view_; // Owned by views hierarchy. 79 ContentsView* contents_view_; // Owned by views hierarchy.
80 80
81 DISALLOW_COPY_AND_ASSIGN(AppListView); 81 DISALLOW_COPY_AND_ASSIGN(AppListView);
82 }; 82 };
83 83
84 } // namespace app_list 84 } // namespace app_list
85 85
86 #endif // UI_APP_LIST_APP_LIST_VIEW_H_ 86 #endif // UI_APP_LIST_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « content/shell/shell_aura.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698