chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - Issue 11316323: Cleanup enums for shelf

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/launcher/chrome_launcher_controller.h

Issue 11316323: Cleanup enums for shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style Created 8 years 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_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

7	7

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

9	9

10 #include "ash/launcher/launcher_delegate.h"	10 #include "ash/launcher/launcher_delegate.h"

11 #include "ash/launcher/launcher_types.h"	11 #include "ash/launcher/launcher_types.h"

12 #include "ash/wm/shelf_types.h"	12 #include "ash/shelf_types.h"

13 #include "chrome/browser/extensions/extension_prefs.h"	13 #include "chrome/browser/extensions/extension_prefs.h"

14	14

15 class BrowserLauncherItemControllerTest;	15 class BrowserLauncherItemControllerTest;

16 class LauncherItemController;	16 class LauncherItemController;

17 class Profile;	17 class Profile;

18 class TabContents;	18 class TabContents;

19	19

20 namespace ash {	20 namespace ash {

21 class LauncherModel;	21 class LauncherModel;

22 }	22 }

(...skipping 239 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 virtual void SetAppTabHelperForTest(AppTabHelper* helper) = 0;	262 virtual void SetAppTabHelperForTest(AppTabHelper* helper) = 0;

263 virtual void SetAppIconLoaderForTest(AppIconLoader* loader) = 0;	263 virtual void SetAppIconLoaderForTest(AppIconLoader* loader) = 0;

264 virtual const std::string& GetAppIdFromLauncherIdForTest(	264 virtual const std::string& GetAppIdFromLauncherIdForTest(

265 ash::LauncherID id) = 0;	265 ash::LauncherID id) = 0;

266	266

267 private:	267 private:

268 static ChromeLauncherController* instance_;	268 static ChromeLauncherController* instance_;

269 };	269 };

270	270

271 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_	271 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_

OLD	NEW