| 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 22 matching lines...) Expand all Loading... |
| 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 (WebsiteSettingsPopupView::GetShownPopupType() != | 37 if (WebsiteSettingsPopupView::GetShownPopupType() != |
| 38 WebsiteSettingsPopupView::POPUP_NONE) { | 38 WebsiteSettingsPopupView::POPUP_NONE) { |
| 39 return; | 39 return; |
| 40 } | 40 } |
| 41 | 41 |
| 42 WebsiteSettingsPopupView::ShowPopup( | 42 WebsiteSettingsPopupView::ShowPopup( |
| 43 nullptr, gfx::Rect(anchor_point, gfx::Size()), profile, web_contents, | 43 nullptr, nullptr, gfx::Rect(anchor_point, gfx::Size()), profile, |
| 44 virtual_url, security_info); | 44 web_contents, virtual_url, security_info); |
| 45 } | 45 } |
| 46 | 46 |
| 47 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point, | 47 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point, |
| 48 gfx::NativeView parent, | 48 gfx::NativeView parent, |
| 49 bookmarks::BookmarkBubbleObserver* observer, | 49 bookmarks::BookmarkBubbleObserver* observer, |
| 50 Browser* browser, | 50 Browser* browser, |
| 51 const GURL& virtual_url, | 51 const GURL& virtual_url, |
| 52 bool already_bookmarked) { | 52 bool already_bookmarked) { |
| 53 // The Views dialog may prompt for sign in. | 53 // The Views dialog may prompt for sign in. |
| 54 std::unique_ptr<BubbleSyncPromoDelegate> delegate( | 54 std::unique_ptr<BubbleSyncPromoDelegate> delegate( |
| (...skipping 22 matching lines...) Expand all Loading... |
| 77 contents->set_parent_window(parent_view); | 77 contents->set_parent_window(parent_view); |
| 78 contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size())); | 78 contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size())); |
| 79 views::BubbleDialogDelegateView::CreateBubble(contents)->Show(); | 79 views::BubbleDialogDelegateView::CreateBubble(contents)->Show(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void ShowUpdateChromeDialogViews(gfx::NativeWindow parent) { | 82 void ShowUpdateChromeDialogViews(gfx::NativeWindow parent) { |
| 83 UpdateRecommendedMessageBox::Show(parent); | 83 UpdateRecommendedMessageBox::Show(parent); |
| 84 } | 84 } |
| 85 | 85 |
| 86 } // namespace chrome | 86 } // namespace chrome |
| OLD | NEW |