OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 last_blocked_command_id_ = id; | 314 last_blocked_command_id_ = id; |
315 last_blocked_command_disposition_ = disposition; | 315 last_blocked_command_disposition_ = disposition; |
316 return; | 316 return; |
317 } | 317 } |
318 | 318 |
319 // The order of commands in this switch statement must match the function | 319 // The order of commands in this switch statement must match the function |
320 // declaration order in browser.h! | 320 // declaration order in browser.h! |
321 switch (id) { | 321 switch (id) { |
322 // Navigation commands | 322 // Navigation commands |
323 case IDC_BACKSPACE_BACK: | 323 case IDC_BACKSPACE_BACK: |
324 if (!base::FeatureList::IsEnabled(kBackspaceGoesBackFeature)) | 324 if (!base::FeatureList::IsEnabled(kBackspaceGoesBackFeature)) { |
| 325 browser_->window()->ShowNewBackShortcutBubble(false); |
325 break; | 326 break; |
| 327 } |
| 328 // FALL THROUGH |
326 case IDC_BACK: | 329 case IDC_BACK: |
327 GoBack(browser_, disposition); | 330 GoBack(browser_, disposition); |
328 break; | 331 break; |
329 case IDC_BACKSPACE_FORWARD: | 332 case IDC_BACKSPACE_FORWARD: |
330 if (!base::FeatureList::IsEnabled(kBackspaceGoesBackFeature)) | 333 if (!base::FeatureList::IsEnabled(kBackspaceGoesBackFeature)) { |
| 334 browser_->window()->ShowNewBackShortcutBubble(true); |
331 break; | 335 break; |
| 336 } |
| 337 // FALL THROUGH |
332 case IDC_FORWARD: | 338 case IDC_FORWARD: |
333 GoForward(browser_, disposition); | 339 GoForward(browser_, disposition); |
334 break; | 340 break; |
335 case IDC_RELOAD: | 341 case IDC_RELOAD: |
336 Reload(browser_, disposition); | 342 Reload(browser_, disposition); |
337 break; | 343 break; |
338 case IDC_RELOAD_CLEARING_CACHE: | 344 case IDC_RELOAD_CLEARING_CACHE: |
339 ClearCache(browser_); | 345 ClearCache(browser_); |
340 // FALL THROUGH | 346 // FALL THROUGH |
341 case IDC_RELOAD_BYPASSING_CACHE: | 347 case IDC_RELOAD_BYPASSING_CACHE: |
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1266 | 1272 |
1267 BrowserWindow* BrowserCommandController::window() { | 1273 BrowserWindow* BrowserCommandController::window() { |
1268 return browser_->window(); | 1274 return browser_->window(); |
1269 } | 1275 } |
1270 | 1276 |
1271 Profile* BrowserCommandController::profile() { | 1277 Profile* BrowserCommandController::profile() { |
1272 return browser_->profile(); | 1278 return browser_->profile(); |
1273 } | 1279 } |
1274 | 1280 |
1275 } // namespace chrome | 1281 } // namespace chrome |
OLD | NEW |