trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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: trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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

« no previous file with comments | « trunk/src/chrome/browser/ui/ash/session_state_delegate_views.cc ('k') | trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_	6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_

7	7

8 #include "apps/app_window_registry.h"	8 #include "apps/app_window_registry.h"

9 #include "ash/ime/input_method_menu_manager.h"	9 #include "ash/ime/input_method_menu_manager.h"

10 #include "ash/session/session_state_observer.h"	10 #include "ash/session_state_observer.h"

11 #include "ash/system/tray/system_tray.h"	11 #include "ash/system/tray/system_tray.h"

12 #include "ash/system/tray/system_tray_delegate.h"	12 #include "ash/system/tray/system_tray_delegate.h"

13 #include "ash/system/tray/system_tray_notifier.h"	13 #include "ash/system/tray/system_tray_notifier.h"

14 #include "base/callback_list.h"	14 #include "base/callback_list.h"

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

16 #include "base/containers/scoped_ptr_hash_map.h"	16 #include "base/containers/scoped_ptr_hash_map.h"

17 #include "base/memory/ref_counted.h"	17 #include "base/memory/ref_counted.h"

18 #include "base/memory/weak_ptr.h"	18 #include "base/memory/weak_ptr.h"

19 #include "base/prefs/pref_change_registrar.h"	19 #include "base/prefs/pref_change_registrar.h"

20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

(...skipping 263 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
284 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>	284 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>

285 accounts_delegates_;	285 accounts_delegates_;

286	286

287 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);	287 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);

288 };	288 };

289	289

290 ash::SystemTrayDelegate* CreateSystemTrayDelegate();	290 ash::SystemTrayDelegate* CreateSystemTrayDelegate();

291	291

292 } // namespace chromeos	292 } // namespace chromeos

293 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_	293 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_

OLD	NEW