ash/shell/shell_delegate_impl.h - Issue 210903003: Implemented system tray UI for new account management.

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: ash/shell/shell_delegate_impl.h

Issue 210903003: Implemented system tray UI for new account management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge conflicts resolved. Created 6 years, 8 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 | « ash/session_state_delegate_stub.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | 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 ASH_SHELL_SHELL_DELEGATE_IMPL_H_	5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_

6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_	6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_

7	7

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

9	9

10 #include "ash/shell_delegate.h"	10 #include "ash/shell_delegate.h"

(...skipping 20 matching lines...) Expand all Loading...
31	31

32 void SetWatcher(WindowWatcher* watcher);	32 void SetWatcher(WindowWatcher* watcher);

33 void set_browser_context(content::BrowserContext* browser_context) {	33 void set_browser_context(content::BrowserContext* browser_context) {

34 browser_context_ = browser_context;	34 browser_context_ = browser_context;

35 }	35 }

36	36

37 virtual bool IsFirstRunAfterBoot() const OVERRIDE;	37 virtual bool IsFirstRunAfterBoot() const OVERRIDE;

38 virtual bool IsIncognitoAllowed() const OVERRIDE;	38 virtual bool IsIncognitoAllowed() const OVERRIDE;

39 virtual bool IsMultiProfilesEnabled() const OVERRIDE;	39 virtual bool IsMultiProfilesEnabled() const OVERRIDE;

40 virtual bool IsRunningInForcedAppMode() const OVERRIDE;	40 virtual bool IsRunningInForcedAppMode() const OVERRIDE;

	41 virtual bool IsMultiAccountEnabled() const OVERRIDE;

41 virtual void PreInit() OVERRIDE;	42 virtual void PreInit() OVERRIDE;

42 virtual void PreShutdown() OVERRIDE;	43 virtual void PreShutdown() OVERRIDE;

43 virtual void Exit() OVERRIDE;	44 virtual void Exit() OVERRIDE;

44 virtual keyboard::KeyboardControllerProxy*	45 virtual keyboard::KeyboardControllerProxy*

45 CreateKeyboardControllerProxy() OVERRIDE;	46 CreateKeyboardControllerProxy() OVERRIDE;

46 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;	47 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;

47 virtual void AddVirtualKeyboardStateObserver(	48 virtual void AddVirtualKeyboardStateObserver(

48 VirtualKeyboardStateObserver* observer) OVERRIDE;	49 VirtualKeyboardStateObserver* observer) OVERRIDE;

49 virtual void RemoveVirtualKeyboardStateObserver(	50 virtual void RemoveVirtualKeyboardStateObserver(

50 VirtualKeyboardStateObserver* observer) OVERRIDE;	51 VirtualKeyboardStateObserver* observer) OVERRIDE;

(...skipping 21 matching lines...) Expand all Loading...
72 ShelfDelegateImpl* shelf_delegate_;	73 ShelfDelegateImpl* shelf_delegate_;

73 content::BrowserContext* browser_context_;	74 content::BrowserContext* browser_context_;

74	75

75 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);	76 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);

76 };	77 };

77	78

78 } // namespace shell	79 } // namespace shell

79 } // namespace ash	80 } // namespace ash

80	81

81 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_	82 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_

OLD	NEW