| OLD | NEW |
| 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 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 // Currently, Textfield (which covers the omnibox and find bar, and likely any | 1500 // Currently, Textfield (which covers the omnibox and find bar, and likely any |
| 1501 // other native UI in the future that wants to deal with clipboard commands) | 1501 // other native UI in the future that wants to deal with clipboard commands) |
| 1502 // does the above. | 1502 // does the above. |
| 1503 ui::Accelerator accelerator; | 1503 ui::Accelerator accelerator; |
| 1504 GetAccelerator(command_id, &accelerator); | 1504 GetAccelerator(command_id, &accelerator); |
| 1505 GetFocusManager()->ProcessAccelerator(accelerator); | 1505 GetFocusManager()->ProcessAccelerator(accelerator); |
| 1506 } | 1506 } |
| 1507 | 1507 |
| 1508 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1508 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1509 const gfx::Rect& bounds) { | 1509 const gfx::Rect& bounds) { |
| 1510 return NEW_POPUP; | 1510 return WindowOpenDisposition::NEW_POPUP; |
| 1511 } | 1511 } |
| 1512 | 1512 |
| 1513 FindBar* BrowserView::CreateFindBar() { | 1513 FindBar* BrowserView::CreateFindBar() { |
| 1514 return new FindBarHost(this); | 1514 return new FindBarHost(this); |
| 1515 } | 1515 } |
| 1516 | 1516 |
| 1517 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() { | 1517 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() { |
| 1518 return GetBrowserViewLayout()->GetWebContentsModalDialogHost(); | 1518 return GetBrowserViewLayout()->GetWebContentsModalDialogHost(); |
| 1519 } | 1519 } |
| 1520 | 1520 |
| (...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2655 } | 2655 } |
| 2656 | 2656 |
| 2657 extensions::ActiveTabPermissionGranter* | 2657 extensions::ActiveTabPermissionGranter* |
| 2658 BrowserView::GetActiveTabPermissionGranter() { | 2658 BrowserView::GetActiveTabPermissionGranter() { |
| 2659 content::WebContents* web_contents = GetActiveWebContents(); | 2659 content::WebContents* web_contents = GetActiveWebContents(); |
| 2660 if (!web_contents) | 2660 if (!web_contents) |
| 2661 return nullptr; | 2661 return nullptr; |
| 2662 return extensions::TabHelper::FromWebContents(web_contents) | 2662 return extensions::TabHelper::FromWebContents(web_contents) |
| 2663 ->active_tab_permission_granter(); | 2663 ->active_tab_permission_granter(); |
| 2664 } | 2664 } |
| OLD | NEW |