Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: ash/shell/shell_delegate_impl.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
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 21 matching lines...) Expand all
32 virtual void NewWindow(bool incognito) OVERRIDE; 32 virtual void NewWindow(bool incognito) OVERRIDE;
33 virtual void OpenFileManager(bool as_dialog) OVERRIDE; 33 virtual void OpenFileManager(bool as_dialog) OVERRIDE;
34 virtual void OpenCrosh() OVERRIDE; 34 virtual void OpenCrosh() OVERRIDE;
35 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE; 35 virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
36 virtual void RestoreTab() OVERRIDE; 36 virtual void RestoreTab() OVERRIDE;
37 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE; 37 virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;
38 virtual void ShowKeyboardOverlay() OVERRIDE; 38 virtual void ShowKeyboardOverlay() OVERRIDE;
39 virtual void ShowTaskManager() OVERRIDE; 39 virtual void ShowTaskManager() OVERRIDE;
40 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; 40 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
41 virtual void ToggleSpokenFeedback() OVERRIDE; 41 virtual void ToggleSpokenFeedback() OVERRIDE;
42 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
42 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 43 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
43 virtual void StartPartialScreenshot( 44 virtual void StartPartialScreenshot(
44 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE; 45 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
45 virtual ash::LauncherDelegate* CreateLauncherDelegate( 46 virtual ash::LauncherDelegate* CreateLauncherDelegate(
46 ash::LauncherModel* model) OVERRIDE; 47 ash::LauncherModel* model) OVERRIDE;
47 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 48 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
48 ash::SystemTray* tray) OVERRIDE; 49 ash::SystemTray* tray) OVERRIDE;
49 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 50 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
50 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 51 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
51 52
52 private: 53 private:
53 // Used to update Launcher. Owned by main. 54 // Used to update Launcher. Owned by main.
54 WindowWatcher* watcher_; 55 WindowWatcher* watcher_;
55 56
56 LauncherDelegateImpl* launcher_delegate_; 57 LauncherDelegateImpl* launcher_delegate_;
57 58
58 bool locked_; 59 bool locked_;
60 bool spoken_feedback_enabled_;
59 61
60 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
61 }; 63 };
62 64
63 } // namespace shell 65 } // namespace shell
64 } // namespace ash 66 } // namespace ash
65 67
66 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 68 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698