chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 210903003: Implemented system tray UI for new account management.

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.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/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

7	7

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

9	9

10 #include "ash/shelf/shelf_item_types.h"	10 #include "ash/shelf/shelf_item_types.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 ChromeShellDelegate();	44 ChromeShellDelegate();

45 virtual ~ChromeShellDelegate();	45 virtual ~ChromeShellDelegate();

46	46

47 static ChromeShellDelegate* instance() { return instance_; }	47 static ChromeShellDelegate* instance() { return instance_; }

48	48

49 // ash::ShellDelegate overrides;	49 // ash::ShellDelegate overrides;

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

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

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

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

	54 virtual bool IsMultiAccountEnabled() const OVERRIDE;

54 virtual void PreInit() OVERRIDE;	55 virtual void PreInit() OVERRIDE;

55 virtual void PreShutdown() OVERRIDE;	56 virtual void PreShutdown() OVERRIDE;

56 virtual void Exit() OVERRIDE;	57 virtual void Exit() OVERRIDE;

57 virtual keyboard::KeyboardControllerProxy*	58 virtual keyboard::KeyboardControllerProxy*

58 CreateKeyboardControllerProxy() OVERRIDE;	59 CreateKeyboardControllerProxy() OVERRIDE;

59 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;	60 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;

60 virtual void AddVirtualKeyboardStateObserver(	61 virtual void AddVirtualKeyboardStateObserver(

61 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;	62 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;

62 virtual void RemoveVirtualKeyboardStateObserver(	63 virtual void RemoveVirtualKeyboardStateObserver(

63 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;	64 ash::VirtualKeyboardStateObserver* observer) OVERRIDE;

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97	98

98 #if defined(OS_CHROMEOS)	99 #if defined(OS_CHROMEOS)

99 scoped_ptr<chromeos::DisplayConfigurationObserver>	100 scoped_ptr<chromeos::DisplayConfigurationObserver>

100 display_configuration_observer_;	101 display_configuration_observer_;

101 #endif	102 #endif

102	103

103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	104 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

104 };	105 };

105	106

106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	107 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW