summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/accelerators/accelerator_controller.cc13
-rw-r--r--ash/accelerators/accelerator_controller_unittest.cc4
-rw-r--r--ash/shell/shell_main.cc4
-rw-r--r--ash/shell_delegate.h3
-rw-r--r--ash/test/test_shell_delegate.cc3
-rw-r--r--ash/test/test_shell_delegate.h1
-rw-r--r--chrome/browser/ui/views/accelerator_table.cc4
-rw-r--r--chrome/browser/ui/views/aura/chrome_shell_delegate.cc4
-rw-r--r--chrome/browser/ui/views/aura/chrome_shell_delegate.h1
9 files changed, 1 insertions, 36 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 943d296..8a736d3 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -9,7 +9,6 @@
#include "ash/launcher/launcher_model.h"
#include "ash/screenshot_delegate.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/window_cycle_controller.h"
#include "ui/aura/event.h"
@@ -26,7 +25,6 @@ namespace {
enum AcceleratorAction {
CYCLE_BACKWARD,
CYCLE_FORWARD,
- EXIT,
TAKE_SCREENSHOT,
TOGGLE_CAPS_LOCK,
#if !defined(NDEBUG)
@@ -47,7 +45,6 @@ struct AcceleratorData {
{ ui::VKEY_TAB, false, false, true, CYCLE_FORWARD },
{ ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD },
{ ui::VKEY_F5, false, false, false, CYCLE_FORWARD },
- { ui::VKEY_Q, true, true, false, EXIT },
{ ui::VKEY_F5, true, false, false, CYCLE_BACKWARD },
{ ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
{ ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT },
@@ -71,14 +68,6 @@ bool HandleCycleWindow(ash::WindowCycleController::Direction direction,
return true;
}
-bool HandleExit() {
- ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
- if (!delegate)
- return false;
- delegate->Exit();
- return true;
-}
-
#if !defined(NDEBUG)
// Rotates the screen.
bool HandleRotateScreen() {
@@ -197,8 +186,6 @@ bool AcceleratorController::AcceleratorPressed(
case CYCLE_FORWARD:
return HandleCycleWindow(WindowCycleController::FORWARD,
accelerator.IsAltDown());
- case EXIT:
- return HandleExit();
case TAKE_SCREENSHOT:
if (screenshot_delegate_.get())
screenshot_delegate_->HandleTakeScreenshot();
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index a9cce71..1de432f 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -319,10 +319,6 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
EXPECT_TRUE(GetController()->Process(
ui::Accelerator(ui::VKEY_F11, false, true, false)));
#endif
-
- // Exit
- EXPECT_TRUE(GetController()->Process(
- ui::Accelerator(ui::VKEY_Q, true, true ,false)));
#endif
}
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index e0521b3..4837071 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -58,10 +58,6 @@ class ShellDelegateImpl : public ash::ShellDelegate {
return ash::internal::CreateStatusArea();
}
- virtual void Exit() OVERRIDE {
- MessageLoopForUI::current()->Quit();
- }
-
virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE {
ash::shell::BuildAppListModel(model);
}
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 3be69cb..ff60e8a 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -56,9 +56,6 @@ class ASH_EXPORT ShellDelegate {
// Invoked to create a new status area. Can return NULL.
virtual views::Widget* CreateStatusArea() = 0;
- // Invoked when a user uses Ctrl-Shift-Q to close chrome.
- virtual void Exit() = 0;
-
// Invoked to ask the delegate to populate the |model|.
virtual void BuildAppListModel(AppListModel* model) = 0;
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index ef080e9..67f1022 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -27,9 +27,6 @@ views::Widget* TestShellDelegate::CreateStatusArea() {
return NULL;
}
-void TestShellDelegate::Exit() {
-}
-
void TestShellDelegate::BuildAppListModel(AppListModel* model) {
}
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9eedc96..c9e3ab3 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -20,7 +20,6 @@ class TestShellDelegate : public ShellDelegate {
// Overridden from ShellDelegate:
virtual void CreateNewWindow() OVERRIDE;
virtual views::Widget* CreateStatusArea() OVERRIDE;
- virtual void Exit() OVERRIDE;
virtual void BuildAppListModel(AppListModel* model) OVERRIDE;
virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
virtual std::vector<aura::Window*> GetCycleWindowList(
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 96f077e..78c85a8 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -38,9 +38,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#if !defined(OS_CHROMEOS)
{ ui::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
#endif
-#if !defined(USE_AURA)
{ ui::VKEY_Q, true, true, false, IDC_EXIT },
-#endif
{ ui::VKEY_F, false, true, false, IDC_FIND },
{ ui::VKEY_G, false, true, false, IDC_FIND_NEXT },
#if !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index 3cc14e3..681f97a 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -88,10 +88,6 @@ views::Widget* ChromeShellDelegate::CreateStatusArea() {
return status_area_widget;
}
-void ChromeShellDelegate::Exit() {
- BrowserList::AttemptUserExit();
-}
-
void ChromeShellDelegate::BuildAppListModel(ash::AppListModel* model) {
AppListModelBuilder builder(ProfileManager::GetDefaultProfile(),
model);
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
index 8bd55a4..3843c70 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
@@ -42,7 +42,6 @@ class ChromeShellDelegate : public ash::ShellDelegate {
// ash::ShellDelegate overrides;
virtual void CreateNewWindow() OVERRIDE;
virtual views::Widget* CreateStatusArea() OVERRIDE;
- virtual void Exit() OVERRIDE;
virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE;
virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
virtual std::vector<aura::Window*> GetCycleWindowList(
generated by cgit v1.1 at 2025-02-07 01:13:02 +0000