Pressing the search button brings the NTP or close it if it is opened.

Note: this requires the WebKit https://bugs.webkit.org/show_bug.cgi?id=39752
to work.

BUG=3404
TEST=See bug.

Review URL: http://codereview.chromium.org/2260004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48658 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 20 insertions, 1 deletions

diff --git a/base/keyboard_code_conversion_gtk.cc b/base/keyboard_code_conversion_gtk.cc
index f5f04c8..91de891 100644
--- a/base/keyboard_code_conversion_gtk.cc
+++ b/base/keyboard_code_conversion_gtk.cc
@@ -263,8 +263,10 @@ base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
     case GDK_Z:
       return VKEY_Z;  // (5A) Z key case 'z': case 'Z': return 0x5A;
     case GDK_Meta_L:
+    case GDK_Super_L:
       return VKEY_LWIN; // (5B) Left Windows key (Microsoft Natural keyboard)
     case GDK_Meta_R:
+    case GDK_Super_R:
       return VKEY_RWIN; // (5C) Right Windows key (Natural keyboard)
       // VKEY_APPS (5D) Applications key (Natural keyboard)
       // VKEY_SLEEP (5F) Computer Sleep key
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index e1ba460..feadb72 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -119,6 +119,7 @@
 #define IDC_COMPACT_NAVBAR              34034
 #define IDC_TOGGLE_VERTICAL_TABS        34035
 #define IDC_EXPERIMENTAL                34036
+#define IDC_SEARCH                      34037
 
 // Page-related commands
 #define IDC_BOOKMARK_PAGE               35000
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 11b759c..2cca704 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1391,6 +1391,17 @@ void Browser::ToggleCompactNavigationBar() {
                             profile_);
   window_->ToggleCompactNavigationBar();
 }
+
+void Browser::Search() {
+  // If the NTP is showing, close it.
+  if (StartsWithASCII(GetSelectedTabContents()->GetURL().spec(),
+                       chrome::kChromeUINewTabURL, true)) {
+    CloseTab();
+    return;
+  }
+  // Otherwise just open it.
+  NewTab();
+}
 #endif
 
 void Browser::Exit() {
@@ -1952,6 +1963,7 @@ void Browser::ExecuteCommandWithDisposition(
     case IDC_TOGGLE_VERTICAL_TABS:  ToggleUseVerticalTabs();       break;
 #if defined(OS_CHROMEOS)
     case IDC_COMPACT_NAVBAR:        ToggleCompactNavigationBar();  break;
+    case IDC_SEARCH:                Search();                      break;
 #endif
 
     // Page-related commands
@@ -2076,7 +2088,8 @@ bool Browser::IsReservedCommand(int command_id) {
          command_id == IDC_RESTORE_TAB ||
          command_id == IDC_SELECT_NEXT_TAB ||
          command_id == IDC_SELECT_PREVIOUS_TAB ||
-         command_id == IDC_EXIT;
+         command_id == IDC_EXIT ||
+         command_id == IDC_SEARCH;
 }
 
 void Browser::SetBlockCommandExecution(bool block) {
@@ -3087,6 +3100,7 @@ void Browser::InitCommandState() {
 
 #if defined(OS_CHROMEOS)
   command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true);
+  command_updater_.UpdateCommandEnabled(IDC_SEARCH, true);
   command_updater_.UpdateCommandEnabled(IDC_SYSTEM_OPTIONS, true);
   command_updater_.UpdateCommandEnabled(IDC_INTERNET_OPTIONS, true);
   command_updater_.UpdateCommandEnabled(IDC_EXPERIMENTAL, true);
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 29d81ea..bc9815e 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -458,6 +458,7 @@ class Browser : public TabStripModelDelegate,
   void Exit();
 #if defined(OS_CHROMEOS)
   void ToggleCompactNavigationBar();
+  void Search();
 #endif
 
   // Page-related commands
diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc
index 9e1f6c9..3edd0e9 100644
--- a/chrome/browser/views/accelerator_table_gtk.cc
+++ b/chrome/browser/views/accelerator_table_gtk.cc
@@ -138,6 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
 #if defined(OS_CHROMEOS)
   { base::VKEY_C, true, true, false, IDC_COMPACT_NAVBAR },
   { base::VKEY_F, false, true, true, IDC_FULLSCREEN },
+  { base::VKEY_LWIN, false, false, false, IDC_SEARCH },
 #endif
 };