chrome/browser/extensions/api/system_indicator/system_indicator_manager.h - Issue 12298037: Revert 183123

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/extensions/api/system_indicator/system_indicator_manager.h

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/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:

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_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAGER_ H_	5 #ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAGER_ H_

6 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAGER_ H_	6 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAGER_ H_

7	7

8 #include <map>	8 #include <map>

9 #include <string>	9 #include <string>

10	10

11 #include "base/memory/linked_ptr.h"	11 #include "base/memory/linked_ptr.h"

12 #include "base/threading/thread_checker.h"

13 #include "chrome/browser/extensions/event_router.h"	12 #include "chrome/browser/extensions/event_router.h"

14 #include "chrome/browser/extensions/extension_action_icon_factory.h"	13 #include "chrome/browser/extensions/extension_action_icon_factory.h"

15 #include "chrome/browser/profiles/profile_keyed_service.h"	14 #include "chrome/browser/profiles/profile_keyed_service.h"

16 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

17 #include "content/public/browser/notification_registrar.h"	16 #include "content/public/browser/notification_registrar.h"

18	17

19 class ExtensionAction;	18 class ExtensionAction;

20 class Profile;	19 class Profile;

21 class StatusTray;	20 class StatusTray;

22	21

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 SystemIndicatorMap system_indicators_;	70 SystemIndicatorMap system_indicators_;

72 content::NotificationRegistrar registrar_;	71 content::NotificationRegistrar registrar_;

73 base::ThreadChecker thread_checker_;	72 base::ThreadChecker thread_checker_;

74	73

75 DISALLOW_COPY_AND_ASSIGN(SystemIndicatorManager);	74 DISALLOW_COPY_AND_ASSIGN(SystemIndicatorManager);

76 };	75 };

77	76

78 } // namespace extensions	77 } // namespace extensions

79	78

80 #endif // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAG ER_H_	79 #endif // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_MANAG ER_H_

OLD	NEW

« no previous file with comments | « chrome/browser/extensions/api/identity/identity_api.cc ('k') | chrome/browser/extensions/api/tabs/ash_panel_contents.cc » ('j') | no next file with comments »