| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 60 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
| 61 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 61 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 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" | |
| 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_confirmation_view.h" | 71 #include "chrome/browser/ui/views/extensions/bookmark_app_confirmation_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" |
| 74 #include "chrome/browser/ui/views/find_bar_host.h" | 73 #include "chrome/browser/ui/views/find_bar_host.h" |
| 75 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 74 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
| 76 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 75 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
| 77 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 76 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
| 78 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 77 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 79 #include "chrome/browser/ui/views/frame/top_container_view.h" | 78 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 80 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 79 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
| (...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) && | 1215 browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) && |
| 1217 toolbar_; | 1216 toolbar_; |
| 1218 } | 1217 } |
| 1219 | 1218 |
| 1220 gfx::Rect BrowserView::GetRootWindowResizerRect() const { | 1219 gfx::Rect BrowserView::GetRootWindowResizerRect() const { |
| 1221 // Views does not support resizer rects because they caused page cycler | 1220 // Views does not support resizer rects because they caused page cycler |
| 1222 // performance regressions when they were added. See crrev.com/9654 | 1221 // performance regressions when they were added. See crrev.com/9654 |
| 1223 return gfx::Rect(); | 1222 return gfx::Rect(); |
| 1224 } | 1223 } |
| 1225 | 1224 |
| 1226 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url, | |
| 1227 Profile* profile) { | |
| 1228 EditSearchEngineDialog::Show(GetNativeWindow(), template_url, nullptr, | |
| 1229 profile); | |
| 1230 } | |
| 1231 | |
| 1232 void BrowserView::ShowUpdateChromeDialog() { | 1225 void BrowserView::ShowUpdateChromeDialog() { |
| 1233 UpdateRecommendedMessageBox::Show(GetNativeWindow()); | 1226 UpdateRecommendedMessageBox::Show(GetNativeWindow()); |
| 1234 } | 1227 } |
| 1235 | 1228 |
| 1236 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { | 1229 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { |
| 1237 std::unique_ptr<BubbleSyncPromoDelegate> delegate; | 1230 std::unique_ptr<BubbleSyncPromoDelegate> delegate; |
| 1238 delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get())); | 1231 delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get())); |
| 1239 | 1232 |
| 1240 views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor(); | 1233 views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor(); |
| 1241 views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble( | 1234 views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble( |
| (...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2647 } | 2640 } |
| 2648 | 2641 |
| 2649 extensions::ActiveTabPermissionGranter* | 2642 extensions::ActiveTabPermissionGranter* |
| 2650 BrowserView::GetActiveTabPermissionGranter() { | 2643 BrowserView::GetActiveTabPermissionGranter() { |
| 2651 content::WebContents* web_contents = GetActiveWebContents(); | 2644 content::WebContents* web_contents = GetActiveWebContents(); |
| 2652 if (!web_contents) | 2645 if (!web_contents) |
| 2653 return nullptr; | 2646 return nullptr; |
| 2654 return extensions::TabHelper::FromWebContents(web_contents) | 2647 return extensions::TabHelper::FromWebContents(web_contents) |
| 2655 ->active_tab_permission_granter(); | 2648 ->active_tab_permission_granter(); |
| 2656 } | 2649 } |
| OLD | NEW |