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

Side by Side Diff: ui/app_list/views/contents_view.h

Issue 164193005: Refactors the auto-launch logic and adds tests for it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win error 2 Created 6 years, 10 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 | « ui/app_list/test/app_list_test_view_delegate.cc ('k') | ui/app_list/views/contents_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_VIEWS_CONTENTS_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // The app list gets closed and drag and drop operations need to be cancelled. 45 // The app list gets closed and drag and drop operations need to be cancelled.
46 void CancelDrag(); 46 void CancelDrag();
47 47
48 // If |drag_and_drop| is not NULL it will be called upon drag and drop 48 // If |drag_and_drop| is not NULL it will be called upon drag and drop
49 // operations outside the application list. 49 // operations outside the application list.
50 void SetDragAndDropHostOfCurrentAppList( 50 void SetDragAndDropHostOfCurrentAppList(
51 ApplicationDragAndDropHost* drag_and_drop_host); 51 ApplicationDragAndDropHost* drag_and_drop_host);
52 52
53 void ShowSearchResults(bool show); 53 void ShowSearchResults(bool show);
54 void ShowFolderContent(AppListFolderItem* folder); 54 void ShowFolderContent(AppListFolderItem* folder);
55 void CancelAutoLaunch();
56 55
57 void Prerender(); 56 void Prerender();
58 57
59 AppsContainerView* apps_container_view() { return apps_container_view_; } 58 AppsContainerView* apps_container_view() { return apps_container_view_; }
60 59
61 // Overridden from views::View: 60 // Overridden from views::View:
62 virtual gfx::Size GetPreferredSize() OVERRIDE; 61 virtual gfx::Size GetPreferredSize() OVERRIDE;
63 virtual void Layout() OVERRIDE; 62 virtual void Layout() OVERRIDE;
64 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 63 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
65 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; 64 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
(...skipping 15 matching lines...) Expand all
81 80
82 // Overridden from ui::EventHandler: 81 // Overridden from ui::EventHandler:
83 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 82 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
84 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 83 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
85 84
86 ShowState show_state_; 85 ShowState show_state_;
87 PaginationModel* pagination_model_; // Owned by AppListController. 86 PaginationModel* pagination_model_; // Owned by AppListController.
88 87
89 AppsContainerView* apps_container_view_; // Owned by the views hierarchy. 88 AppsContainerView* apps_container_view_; // Owned by the views hierarchy.
90 89
91 AppListViewDelegate* view_delegate_; // Owned by AppListView
92
93 scoped_ptr<views::ViewModel> view_model_; 90 scoped_ptr<views::ViewModel> view_model_;
94 scoped_ptr<views::BoundsAnimator> bounds_animator_; 91 scoped_ptr<views::BoundsAnimator> bounds_animator_;
95 92
96 DISALLOW_COPY_AND_ASSIGN(ContentsView); 93 DISALLOW_COPY_AND_ASSIGN(ContentsView);
97 }; 94 };
98 95
99 } // namespace app_list 96 } // namespace app_list
100 97
101 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 98 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/test/app_list_test_view_delegate.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698