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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1846653004: Rename IGNORING_CACHE to BYPASSING_CACHE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <stdint.h> 7 #include <stdint.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 2446 matching lines...) Expand 10 before | Expand all | Expand 10 after
2457 break; 2457 break;
2458 case IDC_FORWARD: 2458 case IDC_FORWARD:
2459 if (key_code == ui::VKEY_BACK) 2459 if (key_code == ui::VKEY_BACK)
2460 content::RecordAction(UserMetricsAction("Accel_Forward_Backspace")); 2460 content::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
2461 else if (key_code == ui::VKEY_BROWSER_FORWARD) 2461 else if (key_code == ui::VKEY_BROWSER_FORWARD)
2462 content::RecordAction(UserMetricsAction("Accel_Forward_F2")); 2462 content::RecordAction(UserMetricsAction("Accel_Forward_F2"));
2463 else if (key_code == ui::VKEY_RIGHT) 2463 else if (key_code == ui::VKEY_RIGHT)
2464 content::RecordAction(UserMetricsAction("Accel_Forward_Right")); 2464 content::RecordAction(UserMetricsAction("Accel_Forward_Right"));
2465 break; 2465 break;
2466 case IDC_RELOAD: 2466 case IDC_RELOAD:
2467 case IDC_RELOAD_IGNORING_CACHE: 2467 case IDC_RELOAD_BYPASSING_CACHE:
2468 if (key_code == ui::VKEY_R) 2468 if (key_code == ui::VKEY_R)
2469 content::RecordAction(UserMetricsAction("Accel_Reload_R")); 2469 content::RecordAction(UserMetricsAction("Accel_Reload_R"));
2470 else if (key_code == ui::VKEY_BROWSER_REFRESH) 2470 else if (key_code == ui::VKEY_BROWSER_REFRESH)
2471 content::RecordAction(UserMetricsAction("Accel_Reload_F3")); 2471 content::RecordAction(UserMetricsAction("Accel_Reload_F3"));
2472 break; 2472 break;
2473 case IDC_FOCUS_LOCATION: 2473 case IDC_FOCUS_LOCATION:
2474 if (key_code == ui::VKEY_D) 2474 if (key_code == ui::VKEY_D)
2475 content::RecordAction(UserMetricsAction("Accel_FocusLocation_D")); 2475 content::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
2476 else if (key_code == ui::VKEY_L) 2476 else if (key_code == ui::VKEY_L)
2477 content::RecordAction(UserMetricsAction("Accel_FocusLocation_L")); 2477 content::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2653 } 2653 }
2654 2654
2655 extensions::ActiveTabPermissionGranter* 2655 extensions::ActiveTabPermissionGranter*
2656 BrowserView::GetActiveTabPermissionGranter() { 2656 BrowserView::GetActiveTabPermissionGranter() {
2657 content::WebContents* web_contents = GetActiveWebContents(); 2657 content::WebContents* web_contents = GetActiveWebContents();
2658 if (!web_contents) 2658 if (!web_contents)
2659 return nullptr; 2659 return nullptr;
2660 return extensions::TabHelper::FromWebContents(web_contents) 2660 return extensions::TabHelper::FromWebContents(web_contents)
2661 ->active_tab_permission_granter(); 2661 ->active_tab_permission_granter();
2662 } 2662 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/panels/panel_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698