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

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 14225016: Add key to focus infobars (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/ui/browser_commands.h » ('j') | 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 "chrome/browser/ui/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/defaults.h" 10 #include "chrome/browser/defaults.h"
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 break; 587 break;
588 case IDC_FOCUS_SEARCH: 588 case IDC_FOCUS_SEARCH:
589 FocusSearch(browser_); 589 FocusSearch(browser_);
590 break; 590 break;
591 case IDC_FOCUS_MENU_BAR: 591 case IDC_FOCUS_MENU_BAR:
592 FocusAppMenu(browser_); 592 FocusAppMenu(browser_);
593 break; 593 break;
594 case IDC_FOCUS_BOOKMARKS: 594 case IDC_FOCUS_BOOKMARKS:
595 FocusBookmarksToolbar(browser_); 595 FocusBookmarksToolbar(browser_);
596 break; 596 break;
597 case IDC_FOCUS_INFOBARS:
598 FocusInfobars(browser_);
599 break;
597 case IDC_FOCUS_NEXT_PANE: 600 case IDC_FOCUS_NEXT_PANE:
598 FocusNextPane(browser_); 601 FocusNextPane(browser_);
599 break; 602 break;
600 case IDC_FOCUS_PREVIOUS_PANE: 603 case IDC_FOCUS_PREVIOUS_PANE:
601 FocusPreviousPane(browser_); 604 FocusPreviousPane(browser_);
602 break; 605 break;
603 606
604 // Show various bits of UI 607 // Show various bits of UI
605 case IDC_OPEN_FILE: 608 case IDC_OPEN_FILE:
606 browser_->OpenFile(); 609 browser_->OpenFile();
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 command_updater_.UpdateCommandEnabled(IDC_FOCUS_LOCATION, show_main_ui); 1128 command_updater_.UpdateCommandEnabled(IDC_FOCUS_LOCATION, show_main_ui);
1126 command_updater_.UpdateCommandEnabled(IDC_FOCUS_SEARCH, show_main_ui); 1129 command_updater_.UpdateCommandEnabled(IDC_FOCUS_SEARCH, show_main_ui);
1127 command_updater_.UpdateCommandEnabled( 1130 command_updater_.UpdateCommandEnabled(
1128 IDC_FOCUS_MENU_BAR, main_not_fullscreen); 1131 IDC_FOCUS_MENU_BAR, main_not_fullscreen);
1129 command_updater_.UpdateCommandEnabled( 1132 command_updater_.UpdateCommandEnabled(
1130 IDC_FOCUS_NEXT_PANE, main_not_fullscreen); 1133 IDC_FOCUS_NEXT_PANE, main_not_fullscreen);
1131 command_updater_.UpdateCommandEnabled( 1134 command_updater_.UpdateCommandEnabled(
1132 IDC_FOCUS_PREVIOUS_PANE, main_not_fullscreen); 1135 IDC_FOCUS_PREVIOUS_PANE, main_not_fullscreen);
1133 command_updater_.UpdateCommandEnabled( 1136 command_updater_.UpdateCommandEnabled(
1134 IDC_FOCUS_BOOKMARKS, main_not_fullscreen); 1137 IDC_FOCUS_BOOKMARKS, main_not_fullscreen);
1138 command_updater_.UpdateCommandEnabled(
1139 IDC_FOCUS_INFOBARS, main_not_fullscreen);
1135 1140
1136 // Show various bits of UI 1141 // Show various bits of UI
1137 command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui); 1142 command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui);
1138 command_updater_.UpdateCommandEnabled(IDC_FEEDBACK, show_main_ui); 1143 command_updater_.UpdateCommandEnabled(IDC_FEEDBACK, show_main_ui);
1139 UpdateShowSyncState(show_main_ui); 1144 UpdateShowSyncState(show_main_ui);
1140 1145
1141 // Settings page/subpages are forced to open in normal mode. We disable these 1146 // Settings page/subpages are forced to open in normal mode. We disable these
1142 // commands when incognito is forced. 1147 // commands when incognito is forced.
1143 const bool options_enabled = show_main_ui && 1148 const bool options_enabled = show_main_ui &&
1144 IncognitoModePrefs::GetAvailability( 1149 IncognitoModePrefs::GetAvailability(
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 1260
1256 BrowserWindow* BrowserCommandController::window() { 1261 BrowserWindow* BrowserCommandController::window() {
1257 return browser_->window(); 1262 return browser_->window();
1258 } 1263 }
1259 1264
1260 Profile* BrowserCommandController::profile() { 1265 Profile* BrowserCommandController::profile() {
1261 return browser_->profile(); 1266 return browser_->profile();
1262 } 1267 }
1263 1268
1264 } // namespace chrome 1269 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/ui/browser_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698