chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 15937008: Unify ActivateCellular into network_connect.cc

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 15937008: Unify ActivateCellular into network_connect.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« chrome/browser/chromeos/options/network_connect.cc ('K') | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_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 (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/launcher/launcher_types.h"	10 #include "ash/launcher/launcher_types.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 virtual bool IsRunningInForcedAppMode() const OVERRIDE;	52 virtual bool IsRunningInForcedAppMode() const OVERRIDE;

53 virtual void PreInit() OVERRIDE;	53 virtual void PreInit() OVERRIDE;

54 virtual void Shutdown() OVERRIDE;	54 virtual void Shutdown() OVERRIDE;

55 virtual void Exit() OVERRIDE;	55 virtual void Exit() OVERRIDE;

56 virtual void NewTab() OVERRIDE;	56 virtual void NewTab() OVERRIDE;

57 virtual void NewWindow(bool is_incognito) OVERRIDE;	57 virtual void NewWindow(bool is_incognito) OVERRIDE;

58 virtual void ToggleFullscreen() OVERRIDE;	58 virtual void ToggleFullscreen() OVERRIDE;

59 virtual void ToggleMaximized() OVERRIDE;	59 virtual void ToggleMaximized() OVERRIDE;

60 virtual void OpenFileManager(bool as_dialog) OVERRIDE;	60 virtual void OpenFileManager(bool as_dialog) OVERRIDE;

61 virtual void OpenCrosh() OVERRIDE;	61 virtual void OpenCrosh() OVERRIDE;

62 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;

63 virtual void RestoreTab() OVERRIDE;	62 virtual void RestoreTab() OVERRIDE;

64 virtual void ShowKeyboardOverlay() OVERRIDE;	63 virtual void ShowKeyboardOverlay() OVERRIDE;

65 virtual keyboard::KeyboardControllerProxy*	64 virtual keyboard::KeyboardControllerProxy*

66 CreateKeyboardControllerProxy() OVERRIDE;	65 CreateKeyboardControllerProxy() OVERRIDE;

67 virtual void ShowTaskManager() OVERRIDE;	66 virtual void ShowTaskManager() OVERRIDE;

68 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;	67 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

69 virtual void ToggleHighContrast() OVERRIDE;	68 virtual void ToggleHighContrast() OVERRIDE;

70 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;	69 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;

71 virtual void ToggleSpokenFeedback(	70 virtual void ToggleSpokenFeedback(

72 ash::AccessibilityNotificationVisibility notify) OVERRIDE;	71 ash::AccessibilityNotificationVisibility notify) OVERRIDE;

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	120 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

122	121

123 ChromeLauncherController* launcher_delegate_;	122 ChromeLauncherController* launcher_delegate_;

124	123

125 scoped_ptr<TabRestoreHelper> tab_restore_helper_;	124 scoped_ptr<TabRestoreHelper> tab_restore_helper_;

126	125

127 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	126 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

128 };	127 };

129	128

130 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	129 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW