| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 #include "chrome/browser/ui/view_ids.h" | 62 #include "chrome/browser/ui/view_ids.h" |
| 63 #include "chrome/browser/ui/views/accelerator_table.h" | 63 #include "chrome/browser/ui/views/accelerator_table.h" |
| 64 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" | 64 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" |
| 65 #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h" | 65 #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h" |
| 66 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 66 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 67 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 67 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
| 68 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 68 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
| 69 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 69 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
| 70 #include "chrome/browser/ui/views/edit_search_engine_dialog.h" | 70 #include "chrome/browser/ui/views/edit_search_engine_dialog.h" |
| 71 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 71 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
| 72 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" | 72 #include "chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.h" |
| 73 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 73 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
| 74 #include "chrome/browser/ui/views/find_bar_host.h" | 74 #include "chrome/browser/ui/views/find_bar_host.h" |
| 75 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 75 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
| 76 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 76 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
| 77 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 77 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
| 78 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 78 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 79 #include "chrome/browser/ui/views/frame/top_container_view.h" | 79 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 80 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 80 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
| 81 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" | 81 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" |
| 82 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 82 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
| (...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1243 views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor(); | 1243 views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor(); |
| 1244 views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble( | 1244 views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble( |
| 1245 anchor_view, gfx::Rect(), nullptr, bookmark_bar_view_.get(), | 1245 anchor_view, gfx::Rect(), nullptr, bookmark_bar_view_.get(), |
| 1246 std::move(delegate), browser_->profile(), url, already_bookmarked); | 1246 std::move(delegate), browser_->profile(), url, already_bookmarked); |
| 1247 GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, bubble_widget); | 1247 GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, bubble_widget); |
| 1248 } | 1248 } |
| 1249 | 1249 |
| 1250 void BrowserView::ShowBookmarkAppBubble( | 1250 void BrowserView::ShowBookmarkAppBubble( |
| 1251 const WebApplicationInfo& web_app_info, | 1251 const WebApplicationInfo& web_app_info, |
| 1252 const ShowBookmarkAppBubbleCallback& callback) { | 1252 const ShowBookmarkAppBubbleCallback& callback) { |
| 1253 BookmarkAppBubbleView::ShowBubble(GetToolbarView(), web_app_info, callback); | 1253 BookmarkAppConfirmationView::CreateAndShow(GetNativeWindow(), web_app_info, |
| 1254 callback); |
| 1254 } | 1255 } |
| 1255 | 1256 |
| 1256 autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble( | 1257 autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble( |
| 1257 content::WebContents* web_contents, | 1258 content::WebContents* web_contents, |
| 1258 autofill::SaveCardBubbleController* controller, | 1259 autofill::SaveCardBubbleController* controller, |
| 1259 bool is_user_gesture) { | 1260 bool is_user_gesture) { |
| 1260 views::View* anchor_view = GetToolbarView()->GetSaveCreditCardBubbleAnchor(); | 1261 views::View* anchor_view = GetToolbarView()->GetSaveCreditCardBubbleAnchor(); |
| 1261 autofill::SaveCardBubbleViews* view = new autofill::SaveCardBubbleViews( | 1262 autofill::SaveCardBubbleViews* view = new autofill::SaveCardBubbleViews( |
| 1262 anchor_view, web_contents, controller); | 1263 anchor_view, web_contents, controller); |
| 1263 GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, view->GetWidget()); | 1264 GetToolbarView()->OnBubbleCreatedForAnchor(anchor_view, view->GetWidget()); |
| (...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2666 } | 2667 } |
| 2667 | 2668 |
| 2668 extensions::ActiveTabPermissionGranter* | 2669 extensions::ActiveTabPermissionGranter* |
| 2669 BrowserView::GetActiveTabPermissionGranter() { | 2670 BrowserView::GetActiveTabPermissionGranter() { |
| 2670 content::WebContents* web_contents = GetActiveWebContents(); | 2671 content::WebContents* web_contents = GetActiveWebContents(); |
| 2671 if (!web_contents) | 2672 if (!web_contents) |
| 2672 return nullptr; | 2673 return nullptr; |
| 2673 return extensions::TabHelper::FromWebContents(web_contents) | 2674 return extensions::TabHelper::FromWebContents(web_contents) |
| 2674 ->active_tab_permission_granter(); | 2675 ->active_tab_permission_granter(); |
| 2675 } | 2676 } |
| OLD | NEW |