| 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 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "chrome/browser/ui/search/search_model.h" | 57 #include "chrome/browser/ui/search/search_model.h" |
| 58 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" | 58 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" |
| 59 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 59 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
| 60 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 60 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 61 #include "chrome/browser/ui/view_ids.h" | 61 #include "chrome/browser/ui/view_ids.h" |
| 62 #include "chrome/browser/ui/views/accelerator_table.h" | 62 #include "chrome/browser/ui/views/accelerator_table.h" |
| 63 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" | 63 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" |
| 64 #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h" | 64 #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h" |
| 65 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 65 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 66 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 66 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
| 67 #include "chrome/browser/ui/views/browser_dialogs.h" | |
| 68 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 67 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
| 69 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 68 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
| 70 #include "chrome/browser/ui/views/edit_search_engine_dialog.h" | 69 #include "chrome/browser/ui/views/edit_search_engine_dialog.h" |
| 71 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 70 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
| 72 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" | 71 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" |
| 73 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 72 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
| 73 #include "chrome/browser/ui/views/find_bar_host.h" |
| 74 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 74 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
| 75 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 75 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
| 76 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 76 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
| 77 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 77 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 78 #include "chrome/browser/ui/views/frame/top_container_view.h" | 78 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 79 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 79 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
| 80 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 80 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
| 81 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 81 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 82 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 82 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
| 83 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 83 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
| (...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1513 GetAccelerator(command_id, &accelerator); | 1513 GetAccelerator(command_id, &accelerator); |
| 1514 GetFocusManager()->ProcessAccelerator(accelerator); | 1514 GetFocusManager()->ProcessAccelerator(accelerator); |
| 1515 } | 1515 } |
| 1516 | 1516 |
| 1517 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1517 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1518 const gfx::Rect& bounds) { | 1518 const gfx::Rect& bounds) { |
| 1519 return NEW_POPUP; | 1519 return NEW_POPUP; |
| 1520 } | 1520 } |
| 1521 | 1521 |
| 1522 FindBar* BrowserView::CreateFindBar() { | 1522 FindBar* BrowserView::CreateFindBar() { |
| 1523 return chrome::CreateFindBar(this); | 1523 return new FindBarHost(this); |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() { | 1526 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() { |
| 1527 return GetBrowserViewLayout()->GetWebContentsModalDialogHost(); | 1527 return GetBrowserViewLayout()->GetWebContentsModalDialogHost(); |
| 1528 } | 1528 } |
| 1529 | 1529 |
| 1530 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 1530 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
| 1531 return bookmark_bar_view_.get(); | 1531 return bookmark_bar_view_.get(); |
| 1532 } | 1532 } |
| 1533 | 1533 |
| (...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2645 } | 2645 } |
| 2646 | 2646 |
| 2647 extensions::ActiveTabPermissionGranter* | 2647 extensions::ActiveTabPermissionGranter* |
| 2648 BrowserView::GetActiveTabPermissionGranter() { | 2648 BrowserView::GetActiveTabPermissionGranter() { |
| 2649 content::WebContents* web_contents = GetActiveWebContents(); | 2649 content::WebContents* web_contents = GetActiveWebContents(); |
| 2650 if (!web_contents) | 2650 if (!web_contents) |
| 2651 return nullptr; | 2651 return nullptr; |
| 2652 return extensions::TabHelper::FromWebContents(web_contents) | 2652 return extensions::TabHelper::FromWebContents(web_contents) |
| 2653 ->active_tab_permission_granter(); | 2653 ->active_tab_permission_granter(); |
| 2654 } | 2654 } |
| OLD | NEW |