chrome/browser/ui/ash/app_list/extension_app_item.h - Issue 10828170: app_list: Fix include paths to point to ui/ash/app_list instead of ui/views/ash/app_list.

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: chrome/browser/ui/ash/app_list/extension_app_item.h

Issue 10828170: app_list: Fix include paths to point to ui/ash/app_list instead of ui/views/ash/app_list. (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

OLD	NEW
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_ASH_APP_LIST_EXTENSION_APP_ITEM_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_

6 #define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_	6 #define CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "chrome/browser/extensions/image_loading_tracker.h"	11 #include "chrome/browser/extensions/image_loading_tracker.h"

12 #include "chrome/browser/ui/views/ash/app_list/chrome_app_list_item.h"	12 #include "chrome/browser/ui/ash/app_list/chrome_app_list_item.h"

13 #include "ui/base/models/simple_menu_model.h"	13 #include "ui/base/models/simple_menu_model.h"

14	14

15 class ExtensionResource;	15 class ExtensionResource;

16 class Profile;	16 class Profile;

17 class SkBitmap;	17 class SkBitmap;

18	18

19 namespace extensions {	19 namespace extensions {

20 class Extension;	20 class Extension;

21 }	21 }

22	22

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 Profile* profile_;	65 Profile* profile_;

66 const std::string extension_id_;	66 const std::string extension_id_;

67	67

68 scoped_ptr<ImageLoadingTracker> tracker_;	68 scoped_ptr<ImageLoadingTracker> tracker_;

69 scoped_ptr<ui::SimpleMenuModel> context_menu_model_;	69 scoped_ptr<ui::SimpleMenuModel> context_menu_model_;

70	70

71 DISALLOW_COPY_AND_ASSIGN(ExtensionAppItem);	71 DISALLOW_COPY_AND_ASSIGN(ExtensionAppItem);

72 };	72 };

73	73

74 #endif // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_	74 #endif // CHROME_BROWSER_UI_VIEWS_ASH_APP_LIST_EXTENSION_APP_ITEM_H_

OLD	NEW