0
Files
src/ash/shell/shell_delegate_impl.h
mazda@chromium.org ab1773928e Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list.
The following changes are for removing TOGGLE_MAXIMIZED_* from Ash reserved actions list.
- Add ShellDelegate::ToggleMaximized
- Remove VKEY_F4 from browser accelerators list

Also added a browser test for ChromeShellDelegate::ToggleMaximized.

BUG=152265
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/11082002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161015 0039d316-1c4b-4281-b951-d872f2087c98
2012-10-10 02:34:04 +00:00

78 lines
2.8 KiB
C++

// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
#define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
#include "ash/shell_delegate.h"
#include "base/compiler_specific.h"
namespace ash {
namespace shell {
class LauncherDelegateImpl;
class WindowWatcher;
class ShellDelegateImpl : public ash::ShellDelegate {
public:
ShellDelegateImpl();
virtual ~ShellDelegateImpl();
void SetWatcher(WindowWatcher* watcher);
virtual bool IsUserLoggedIn() OVERRIDE;
virtual bool IsSessionStarted() OVERRIDE;
virtual bool IsFirstRunAfterBoot() OVERRIDE;
virtual void LockScreen() OVERRIDE;
virtual void UnlockScreen() OVERRIDE;
virtual bool IsScreenLocked() const OVERRIDE;
virtual void Shutdown() OVERRIDE;
virtual void Exit() OVERRIDE;
virtual void NewTab() OVERRIDE;
virtual void NewWindow(bool incognito) OVERRIDE;
virtual void ToggleMaximized() OVERRIDE;
virtual void OpenFileManager(bool as_dialog) OVERRIDE;
virtual void OpenCrosh() OVERRIDE;
virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
virtual void RestoreTab() OVERRIDE;
virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;
virtual void ShowKeyboardOverlay() OVERRIDE;
virtual void ShowTaskManager() OVERRIDE;
virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
virtual void ToggleSpokenFeedback() OVERRIDE;
virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
virtual ash::LauncherDelegate* CreateLauncherDelegate(
ash::LauncherModel* model) OVERRIDE;
virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
ash::SystemTray* tray) OVERRIDE;
virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
virtual void OpenFeedbackPage() OVERRIDE;
virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
virtual void HandleMediaNextTrack() OVERRIDE;
virtual void HandleMediaPlayPause() OVERRIDE;
virtual void HandleMediaPrevTrack() OVERRIDE;
virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
private:
// Used to update Launcher. Owned by main.
WindowWatcher* watcher_;
LauncherDelegateImpl* launcher_delegate_;
bool locked_;
bool spoken_feedback_enabled_;
DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
};
} // namespace shell
} // namespace ash
#endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_