Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: ui/views/controls/menu/menu_controller.cc

Issue 484133002: "F4" doesn't close/open the "Folder" dropdown on "Bookmark added!" pop-up. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« AUTHORS ('K') | « AUTHORS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "ui/views/controls/menu/menu_controller.h" 5 #include "ui/views/controls/menu/menu_controller.h"
6 6
7 #include "base/i18n/case_conversion.h" 7 #include "base/i18n/case_conversion.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 break; 1027 break;
1028 1028
1029 case ui::VKEY_SPACE: 1029 case ui::VKEY_SPACE:
1030 if (SendAcceleratorToHotTrackedView() == ACCELERATOR_PROCESSED_EXIT) 1030 if (SendAcceleratorToHotTrackedView() == ACCELERATOR_PROCESSED_EXIT)
1031 return false; 1031 return false;
1032 break; 1032 break;
1033 1033
1034 case ui::VKEY_F4: 1034 case ui::VKEY_F4:
1035 if (!is_combobox_) 1035 if (!is_combobox_)
1036 break; 1036 break;
1037 // Fallthrough to accept on F4, so combobox menus match Windows behavior. 1037 // Fallthrough to accept on F4, so combobox menus match Windows behavior.
msw 2014/08/20 01:05:01 nit: "Fallthrough to accept or dismiss combobox me
Deepak 2014/08/20 03:37:33 Done.
1038 case ui::VKEY_RETURN: 1038 case ui::VKEY_RETURN:
1039 if (pending_state_.item) { 1039 if (pending_state_.item) {
1040 if (pending_state_.item->HasSubmenu()) { 1040 if (pending_state_.item->HasSubmenu()) {
1041 OpenSubmenuChangeSelectionIfCan(); 1041 if (key_code == ui::VKEY_F4 &&
1042 pending_state_.item->GetSubmenu()->IsShowing())
sky 2014/08/20 02:45:39 Why does it matter whether the submenu is showing?
Deepak 2014/08/20 03:37:33 As When Submneu is shown, and we select F4, we wan
sky 2014/08/20 15:21:39 Comboboxs don't have submenus, right?
1043 return false;
1044 else
1045 OpenSubmenuChangeSelectionIfCan();
1042 } else { 1046 } else {
1043 SendAcceleratorResultType result = SendAcceleratorToHotTrackedView(); 1047 SendAcceleratorResultType result = SendAcceleratorToHotTrackedView();
1044 if (result == ACCELERATOR_NOT_PROCESSED && 1048 if (result == ACCELERATOR_NOT_PROCESSED &&
1045 pending_state_.item->enabled()) { 1049 pending_state_.item->enabled()) {
1046 Accept(pending_state_.item, 0); 1050 Accept(pending_state_.item, 0);
1047 return false; 1051 return false;
1048 } else if (result == ACCELERATOR_PROCESSED_EXIT) { 1052 } else if (result == ACCELERATOR_PROCESSED_EXIT) {
1049 return false; 1053 return false;
1050 } 1054 }
1051 } 1055 }
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
2305 } 2309 }
2306 } 2310 }
2307 2311
2308 gfx::Screen* MenuController::GetScreen() { 2312 gfx::Screen* MenuController::GetScreen() {
2309 Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL; 2313 Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
2310 return root ? gfx::Screen::GetScreenFor(root->GetNativeView()) 2314 return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
2311 : gfx::Screen::GetNativeScreen(); 2315 : gfx::Screen::GetNativeScreen();
2312 } 2316 }
2313 2317
2314 } // namespace views 2318 } // namespace views
OLDNEW
« AUTHORS ('K') | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698