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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2423 else if (key_code == ui::VKEY_RIGHT) | 2423 else if (key_code == ui::VKEY_RIGHT) |
2424 content::RecordAction(UserMetricsAction("Accel_Forward_Right")); | 2424 content::RecordAction(UserMetricsAction("Accel_Forward_Right")); |
2425 break; | 2425 break; |
2426 case IDC_RELOAD: | 2426 case IDC_RELOAD: |
2427 case IDC_RELOAD_IGNORING_CACHE: | 2427 case IDC_RELOAD_IGNORING_CACHE: |
2428 if (key_code == ui::VKEY_R) | 2428 if (key_code == ui::VKEY_R) |
2429 content::RecordAction(UserMetricsAction("Accel_Reload_R")); | 2429 content::RecordAction(UserMetricsAction("Accel_Reload_R")); |
2430 else if (key_code == ui::VKEY_F3) | 2430 else if (key_code == ui::VKEY_F3) |
2431 content::RecordAction(UserMetricsAction("Accel_Reload_F3")); | 2431 content::RecordAction(UserMetricsAction("Accel_Reload_F3")); |
2432 break; | 2432 break; |
2433 case IDC_FULLSCREEN: | |
2434 if (key_code == ui::VKEY_F4) | |
2435 content::RecordAction(UserMetricsAction("Accel_Fullscreen_F4")); | |
2436 break; | |
2437 case IDC_FOCUS_LOCATION: | 2433 case IDC_FOCUS_LOCATION: |
2438 if (key_code == ui::VKEY_D) | 2434 if (key_code == ui::VKEY_D) |
2439 content::RecordAction(UserMetricsAction("Accel_FocusLocation_D")); | 2435 content::RecordAction(UserMetricsAction("Accel_FocusLocation_D")); |
2440 else if (key_code == ui::VKEY_L) | 2436 else if (key_code == ui::VKEY_L) |
2441 content::RecordAction(UserMetricsAction("Accel_FocusLocation_L")); | 2437 content::RecordAction(UserMetricsAction("Accel_FocusLocation_L")); |
2442 break; | 2438 break; |
2443 case IDC_FOCUS_SEARCH: | 2439 case IDC_FOCUS_SEARCH: |
2444 if (key_code == ui::VKEY_E) | 2440 if (key_code == ui::VKEY_E) |
2445 content::RecordAction(UserMetricsAction("Accel_FocusSearch_E")); | 2441 content::RecordAction(UserMetricsAction("Accel_FocusSearch_E")); |
2446 else if (key_code == ui::VKEY_K) | 2442 else if (key_code == ui::VKEY_K) |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2615 | 2611 |
2616 Browser* modal_browser = | 2612 Browser* modal_browser = |
2617 browser::FindBrowserWithWebContents(active_dialog->web_contents()); | 2613 browser::FindBrowserWithWebContents(active_dialog->web_contents()); |
2618 if (modal_browser && (browser_ != modal_browser)) { | 2614 if (modal_browser && (browser_ != modal_browser)) { |
2619 modal_browser->window()->FlashFrame(true); | 2615 modal_browser->window()->FlashFrame(true); |
2620 modal_browser->window()->Activate(); | 2616 modal_browser->window()->Activate(); |
2621 } | 2617 } |
2622 | 2618 |
2623 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2619 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2624 } | 2620 } |
OLD | NEW |