OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" | 7 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_dialogs.h" | 9 #include "chrome/browser/ui/browser_dialogs.h" |
10 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 10 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 content::WebContents* web_contents, | 27 content::WebContents* web_contents, |
28 const GURL& virtual_url, | 28 const GURL& virtual_url, |
29 const security_state::SecurityInfo& security_info) { | 29 const security_state::SecurityInfo& security_info) { |
30 // Don't show the bubble again if it's already showing. A second click on the | 30 // Don't show the bubble again if it's already showing. A second click on the |
31 // location icon in the omnibox will dismiss an open bubble. This behaviour is | 31 // location icon in the omnibox will dismiss an open bubble. This behaviour is |
32 // consistent with the non-Mac views implementation. | 32 // consistent with the non-Mac views implementation. |
33 // Note that when the browser is toolkit-views, IsPopupShowing() is checked | 33 // Note that when the browser is toolkit-views, IsPopupShowing() is checked |
34 // earlier because the popup is shown on mouse release (but dismissed on | 34 // earlier because the popup is shown on mouse release (but dismissed on |
35 // mouse pressed). A Cocoa browser does both on mouse pressed, so a check | 35 // mouse pressed). A Cocoa browser does both on mouse pressed, so a check |
36 // when showing is sufficient. | 36 // when showing is sufficient. |
37 if (PageInfoPopupView::GetShownPopupType() != PageInfoPopupView::POPUP_NONE) { | 37 if (PageInfoBubbleView::GetShownPopupType() != |
| 38 PageInfoBubbleView::POPUP_NONE) { |
38 return; | 39 return; |
39 } | 40 } |
40 | 41 |
41 PageInfoPopupView::ShowPopup(nullptr, gfx::Rect(anchor_point, gfx::Size()), | 42 PageInfoBubbleView::ShowPopup(nullptr, gfx::Rect(anchor_point, gfx::Size()), |
42 profile, web_contents, virtual_url, | 43 profile, web_contents, virtual_url, |
43 security_info); | 44 security_info); |
44 } | 45 } |
45 | 46 |
46 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point, | 47 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point, |
47 gfx::NativeView parent, | 48 gfx::NativeView parent, |
48 bookmarks::BookmarkBubbleObserver* observer, | 49 bookmarks::BookmarkBubbleObserver* observer, |
49 Browser* browser, | 50 Browser* browser, |
50 const GURL& virtual_url, | 51 const GURL& virtual_url, |
51 bool already_bookmarked) { | 52 bool already_bookmarked) { |
52 // The Views dialog may prompt for sign in. | 53 // The Views dialog may prompt for sign in. |
53 std::unique_ptr<BubbleSyncPromoDelegate> delegate( | 54 std::unique_ptr<BubbleSyncPromoDelegate> delegate( |
(...skipping 22 matching lines...) Expand all Loading... |
76 contents->set_parent_window(parent_view); | 77 contents->set_parent_window(parent_view); |
77 contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size())); | 78 contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size())); |
78 views::BubbleDialogDelegateView::CreateBubble(contents)->Show(); | 79 views::BubbleDialogDelegateView::CreateBubble(contents)->Show(); |
79 } | 80 } |
80 | 81 |
81 void ShowUpdateChromeDialogViews(gfx::NativeWindow parent) { | 82 void ShowUpdateChromeDialogViews(gfx::NativeWindow parent) { |
82 UpdateRecommendedMessageBox::Show(parent); | 83 UpdateRecommendedMessageBox::Show(parent); |
83 } | 84 } |
84 | 85 |
85 } // namespace chrome | 86 } // namespace chrome |
OLD | NEW |