summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 06:56:06 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 06:56:06 +0000
commit4d7ce435aeddeb8befc02ef741d3fd62b6d427ae (patch)
treef6f553f84b34d7f2c83ee9254d6f412c09bc51ca /ash
parenta9f1657afd334527f342ccd40ddb8d0652824a89 (diff)
downloadchromium_src-4d7ce435aeddeb8befc02ef741d3fd62b6d427ae.zip
chromium_src-4d7ce435aeddeb8befc02ef741d3fd62b6d427ae.tar.gz
chromium_src-4d7ce435aeddeb8befc02ef741d3fd62b6d427ae.tar.bz2
Support "Report Issue" in case of no-browser windows in ChromeOS.
"Report Issue" shortcut (Alt-Shift-I) should be available even if there are no browser windows, in case that the user wants to report issues of ChromeOS window systems. Changes around ash: add OPEN_FEEDBACK_PAGE accelerator command and assign it in the global shortcut key Changes around feedback_ui: allow 'tab_index' parameter is -1 BUG=131158 TEST=manually verified on lumpy, in case of no-windows and some windows Review URL: https://chromiumcodereview.appspot.com/10698115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_controller.cc3
-rw-r--r--ash/accelerators/accelerator_table.cc1
-rw-r--r--ash/accelerators/accelerator_table.h13
-rw-r--r--ash/shell/shell_delegate_impl.cc4
-rw-r--r--ash/shell/shell_delegate_impl.h1
-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
8 files changed, 23 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 43a68b7..3e6339c 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -400,6 +400,9 @@ bool AcceleratorController::PerformAction(int action,
ash::Shell::GetInstance()->output_configurator()->CycleDisplayMode();
return true;
#endif
+ case OPEN_FEEDBACK_PAGE:
+ ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
+ return true;
case EXIT:
return HandleExit();
case NEW_INCOGNITO_WINDOW:
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index f01b1be..8df198a 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -54,6 +54,7 @@ const AcceleratorData kAcceleratorData[] = {
{ true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
{ true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
#endif
+ { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
{ true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
{ true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
TOGGLE_SPOKEN_FEEDBACK },
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index ddc6c7c..58004a0 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -19,6 +19,9 @@ enum AcceleratorAction {
CYCLE_BACKWARD_MRU,
CYCLE_FORWARD_LINEAR,
CYCLE_FORWARD_MRU,
+ DISPLAY_ADD_REMOVE,
+ DISPLAY_CYCLE,
+ DISPLAY_TOGGLE_SCALE,
EXIT,
FOCUS_LAUNCHER,
FOCUS_NEXT_PANE,
@@ -32,8 +35,10 @@ enum AcceleratorAction {
NEW_TAB,
NEW_WINDOW,
NEXT_IME,
+ OPEN_FEEDBACK_PAGE,
PREVIOUS_IME,
RESTORE_TAB,
+ ROTATE_SCREEN,
ROTATE_WINDOWS,
SELECT_LAST_WIN,
SELECT_WIN_0,
@@ -53,6 +58,8 @@ enum AcceleratorAction {
TAKE_SCREENSHOT_BY_PRTSCN_KEY, // PrtScn
TOGGLE_APP_LIST,
TOGGLE_CAPS_LOCK,
+ TOGGLE_DESKTOP_BACKGROUND_MODE,
+ TOGGLE_ROOT_WINDOW_FULL_SCREEN,
TOGGLE_SPOKEN_FEEDBACK,
VOLUME_DOWN,
VOLUME_MUTE,
@@ -69,12 +76,6 @@ enum AcceleratorAction {
OPEN_FILE_MANAGER_DIALOG,
OPEN_FILE_MANAGER_TAB,
#endif
- DISPLAY_ADD_REMOVE,
- DISPLAY_CYCLE,
- DISPLAY_TOGGLE_SCALE,
- ROTATE_SCREEN,
- TOGGLE_DESKTOP_BACKGROUND_MODE,
- TOGGLE_ROOT_WINDOW_FULL_SCREEN,
#if !defined(NDEBUG)
PRINT_LAYER_HIERARCHY,
PRINT_WINDOW_HIERARCHY,
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index bc3f30d..9accbd6 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -124,9 +124,13 @@ ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate(
ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
return NULL;
}
+
aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
return NULL;
}
+void ShellDelegateImpl::OpenFeedbackPage() {
+}
+
} // namespace shell
} // namespace ash
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 852c6be..2216c92d 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -48,6 +48,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
ash::SystemTray* tray) OVERRIDE;
virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
+ virtual void OpenFeedbackPage() OVERRIDE;
private:
// Used to update Launcher. Owned by main.
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index c7cab00..02389fa 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -120,6 +120,9 @@ class ASH_EXPORT ShellDelegate {
// Creates a user action client. Shell takes ownership of the object.
virtual aura::client::UserActionClient* CreateUserActionClient() = 0;
+
+ // Opens the feedback page for "Report Issue".
+ virtual void OpenFeedbackPage() = 0;
};
} // namespace ash
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index fc6ff4d..cf5ccd3 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -115,5 +115,8 @@ aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
return NULL;
}
+void TestShellDelegate::OpenFeedbackPage() {
+}
+
} // namespace test
} // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 35a6a7a..b929822 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -43,6 +43,7 @@ class TestShellDelegate : public ShellDelegate {
virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
+ virtual void OpenFeedbackPage() OVERRIDE;
private:
bool locked_;