chrome/browser/ui/views/ash/chrome_shell_delegate.h - Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.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

« ash/shell_delegate.h ('K') | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')

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 20 matching lines...) Expand all Loading...
31 WindowPositioner* window_positioner() { return window_positioner_.get(); }	31 WindowPositioner* window_positioner() { return window_positioner_.get(); }

32	32

33 // ash::ShellDelegate overrides;	33 // ash::ShellDelegate overrides;

34 virtual bool IsUserLoggedIn() OVERRIDE;	34 virtual bool IsUserLoggedIn() OVERRIDE;

35 virtual void LockScreen() OVERRIDE;	35 virtual void LockScreen() OVERRIDE;

36 virtual void UnlockScreen() OVERRIDE;	36 virtual void UnlockScreen() OVERRIDE;

37 virtual bool IsScreenLocked() const OVERRIDE;	37 virtual bool IsScreenLocked() const OVERRIDE;

38 virtual void Shutdown() OVERRIDE;	38 virtual void Shutdown() OVERRIDE;

39 virtual void Exit() OVERRIDE;	39 virtual void Exit() OVERRIDE;

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

	41 virtual bool IsBrowserWindow(const aura::Window* window) OVERRIDE;

41 virtual void Search() OVERRIDE;	42 virtual void Search() OVERRIDE;

42 virtual void OpenFileManager() OVERRIDE;	43 virtual void OpenFileManager() OVERRIDE;

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

44 virtual void OpenMobileSetup() OVERRIDE;	45 virtual void OpenMobileSetup() OVERRIDE;

45 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	46 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

46 virtual void StartPartialScreenshot(	47 virtual void StartPartialScreenshot(

47 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;	48 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;

48 virtual ash::LauncherDelegate* CreateLauncherDelegate(	49 virtual ash::LauncherDelegate* CreateLauncherDelegate(

49 ash::LauncherModel* model) OVERRIDE;	50 ash::LauncherModel* model) OVERRIDE;

50 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(	51 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(

(...skipping 11 matching lines...) Expand all Loading...
62 content::NotificationRegistrar registrar_;	63 content::NotificationRegistrar registrar_;

63	64

64 scoped_ptr<WindowPositioner> window_positioner_;	65 scoped_ptr<WindowPositioner> window_positioner_;

65	66

66 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	67 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

67	68

68 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	69 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

69 };	70 };

70	71

71 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	72 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW