chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.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_per_browser.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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h ('k') | no next file » | no next file with comments »

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_PER_BROWSER_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_

7	7

8 #include <list>	8 #include <list>

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

11	11

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

13 #include "ash/launcher/launcher_model_observer.h"	13 #include "ash/launcher/launcher_model_observer.h"

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

	15 #include "ash/shelf_types.h"

15 #include "ash/shell_observer.h"	16 #include "ash/shell_observer.h"

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

17 #include "base/basictypes.h"	17 #include "base/basictypes.h"

18 #include "base/compiler_specific.h"	18 #include "base/compiler_specific.h"

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

20 #include "base/prefs/public/pref_change_registrar.h"	20 #include "base/prefs/public/pref_change_registrar.h"

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

22 #include "chrome/browser/prefs/pref_service_observer.h"	22 #include "chrome/browser/prefs/pref_service_observer.h"

23 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"	23 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"

24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

25 #include "content/public/browser/notification_observer.h"	25 #include "content/public/browser/notification_observer.h"

26 #include "content/public/browser/notification_registrar.h"	26 #include "content/public/browser/notification_registrar.h"

(...skipping 301 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
328 content::NotificationRegistrar notification_registrar_;	328 content::NotificationRegistrar notification_registrar_;

329	329

330 PrefChangeRegistrar pref_change_registrar_;	330 PrefChangeRegistrar pref_change_registrar_;

331	331

332 AppSyncUIState* app_sync_ui_state_;	332 AppSyncUIState* app_sync_ui_state_;

333	333

334 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);	334 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);

335 };	335 };

336	336

337 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_	337 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_

OLD	NEW