ui/app_list/views/app_list_main_view.h - Issue 12088037: Revert 179302

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12088037: Revert 179302 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 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:

« no previous file with comments | « ui/app_list/views/DEPS ('k') | ui/app_list/views/app_list_main_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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_APP_LIST_MAIN_VIEW_H_	5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_

6 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_	6 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_

7	7

8 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "base/timer.h"	9 #include "base/timer.h"

10 #include "ui/app_list/apps_grid_view_delegate.h"	10 #include "ui/app_list/apps_grid_view_delegate.h"

11 #include "ui/app_list/search_box_view_delegate.h"	11 #include "ui/app_list/search_box_view_delegate.h"

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;	83 base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;

84	84

85 ScopedVector<IconLoader> pending_icon_loaders_;	85 ScopedVector<IconLoader> pending_icon_loaders_;

86	86

87 DISALLOW_COPY_AND_ASSIGN(AppListMainView);	87 DISALLOW_COPY_AND_ASSIGN(AppListMainView);

88 };	88 };

89	89

90 } // namespace app_list	90 } // namespace app_list

91	91

92 #endif // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_	92 #endif // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_

OLD	NEW