chrome/browser/ui/views/ash/chrome_shell_delegate.h - Issue 10543158: Do not toggle Applist with Search key press when accessibility is enabled.

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

Issue 10543158: Do not toggle Applist with Search key press when accessibility is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge similar functions Created 8 years, 6 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

« ash/shell/shell_delegate_impl.cc ('K') | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.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_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

7 #pragma once	7 #pragma once

8	8

9 #include "ash/launcher/launcher_types.h"	9 #include "ash/launcher/launcher_types.h"

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

(...skipping 30 matching lines...) Expand all Loading...
41 virtual void NewWindow(bool is_incognito) OVERRIDE;	41 virtual void NewWindow(bool is_incognito) OVERRIDE;

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

43 virtual void OpenCrosh() OVERRIDE;	43 virtual void OpenCrosh() OVERRIDE;

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

45 virtual void RestoreTab() OVERRIDE;	45 virtual void RestoreTab() OVERRIDE;

46 virtual bool RotatePaneFocus(ash::Shell::Direction direction) OVERRIDE;	46 virtual bool RotatePaneFocus(ash::Shell::Direction direction) OVERRIDE;

47 virtual void ShowKeyboardOverlay() OVERRIDE;	47 virtual void ShowKeyboardOverlay() OVERRIDE;

48 virtual void ShowTaskManager() OVERRIDE;	48 virtual void ShowTaskManager() OVERRIDE;

49 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;	49 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

50 virtual void ToggleSpokenFeedback() OVERRIDE;	50 virtual void ToggleSpokenFeedback() OVERRIDE;

	51 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;

51 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	52 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

52 virtual void StartPartialScreenshot(	53 virtual void StartPartialScreenshot(

53 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;	54 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;

54 virtual ash::LauncherDelegate* CreateLauncherDelegate(	55 virtual ash::LauncherDelegate* CreateLauncherDelegate(

55 ash::LauncherModel* model) OVERRIDE;	56 ash::LauncherModel* model) OVERRIDE;

56 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(	57 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(

57 ash::SystemTray* tray) OVERRIDE;	58 ash::SystemTray* tray) OVERRIDE;

58 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	59 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

59 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	60 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

60	61

61 // content::NotificationObserver override:	62 // content::NotificationObserver override:

62 virtual void Observe(int type,	63 virtual void Observe(int type,

63 const content::NotificationSource& source,	64 const content::NotificationSource& source,

64 const content::NotificationDetails& details) OVERRIDE;	65 const content::NotificationDetails& details) OVERRIDE;

65	66

66 private:	67 private:

67 static ChromeShellDelegate* instance_;	68 static ChromeShellDelegate* instance_;

68	69

69 content::NotificationRegistrar registrar_;	70 content::NotificationRegistrar registrar_;

70	71

71 scoped_ptr<WindowPositioner> window_positioner_;	72 scoped_ptr<WindowPositioner> window_positioner_;

72	73

73 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	74 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

74	75

75 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	76 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

76 };	77 };

77	78

78 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	79 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW