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

Side by Side Diff: ash/shell/shell_delegate_impl.h

Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 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
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 11 matching lines...) Expand all
22 22
23 void SetWatcher(WindowWatcher* watcher); 23 void SetWatcher(WindowWatcher* watcher);
24 24
25 virtual bool IsUserLoggedIn() OVERRIDE; 25 virtual bool IsUserLoggedIn() OVERRIDE;
26 virtual void LockScreen() OVERRIDE; 26 virtual void LockScreen() OVERRIDE;
27 virtual void UnlockScreen() OVERRIDE; 27 virtual void UnlockScreen() OVERRIDE;
28 virtual bool IsScreenLocked() const OVERRIDE; 28 virtual bool IsScreenLocked() const OVERRIDE;
29 virtual void Shutdown() OVERRIDE; 29 virtual void Shutdown() OVERRIDE;
30 virtual void Exit() OVERRIDE; 30 virtual void Exit() OVERRIDE;
31 virtual void NewWindow(bool incognito) OVERRIDE; 31 virtual void NewWindow(bool incognito) OVERRIDE;
32 virtual bool IsBrowserWindow(const aura::Window* window) OVERRIDE;
32 virtual void Search() OVERRIDE; 33 virtual void Search() OVERRIDE;
33 virtual void OpenFileManager() OVERRIDE; 34 virtual void OpenFileManager() OVERRIDE;
34 virtual void OpenCrosh() OVERRIDE; 35 virtual void OpenCrosh() OVERRIDE;
35 virtual void OpenMobileSetup() OVERRIDE; 36 virtual void OpenMobileSetup() OVERRIDE;
36 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 37 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
37 virtual void StartPartialScreenshot( 38 virtual void StartPartialScreenshot(
38 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE; 39 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
39 virtual ash::LauncherDelegate* CreateLauncherDelegate( 40 virtual ash::LauncherDelegate* CreateLauncherDelegate(
40 ash::LauncherModel* model) OVERRIDE; 41 ash::LauncherModel* model) OVERRIDE;
41 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 42 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
42 ash::SystemTray* tray) OVERRIDE; 43 ash::SystemTray* tray) OVERRIDE;
43 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 44 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
44 45
45 private: 46 private:
46 // Used to update Launcher. Owned by main. 47 // Used to update Launcher. Owned by main.
47 WindowWatcher* watcher_; 48 WindowWatcher* watcher_;
48 49
49 LauncherDelegateImpl* launcher_delegate_; 50 LauncherDelegateImpl* launcher_delegate_;
50 51
51 bool locked_; 52 bool locked_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 54 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
54 }; 55 };
55 56
56 } // namespace shell 57 } // namespace shell
57 } // namespace ash 58 } // namespace ash
58 59
59 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 60 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698