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" |
11 #include "chrome/browser/ui/views/content_setting_bubble_contents.h" | |
11 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " | 12 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " |
12 | 13 |
13 // This file provides definitions of desktop browser dialog-creation methods for | 14 // This file provides definitions of desktop browser dialog-creation methods for |
14 // Mac where a Cocoa browser is using Views dialogs. I.e. it is included in the | 15 // Mac where a Cocoa browser is using Views dialogs. I.e. it is included in the |
15 // Cocoa build and definitions under chrome/browser/ui/cocoa may select at | 16 // Cocoa build and definitions under chrome/browser/ui/cocoa may select at |
16 // runtime whether to show a Cocoa dialog, or the toolkit-views dialog defined | 17 // runtime whether to show a Cocoa dialog, or the toolkit-views dialog defined |
17 // here (declared in browser_dialogs.h). | 18 // here (declared in browser_dialogs.h). |
18 | 19 |
19 namespace chrome { | 20 namespace chrome { |
20 | 21 |
(...skipping 16 matching lines...) Expand all Loading... | |
37 bool already_bookmarked) { | 38 bool already_bookmarked) { |
38 // The Views dialog may prompt for sign in. | 39 // The Views dialog may prompt for sign in. |
39 scoped_ptr<BubbleSyncPromoDelegate> delegate( | 40 scoped_ptr<BubbleSyncPromoDelegate> delegate( |
40 new BookmarkBubbleSignInDelegate(browser)); | 41 new BookmarkBubbleSignInDelegate(browser)); |
41 | 42 |
42 BookmarkBubbleView::ShowBubble(nullptr, gfx::Rect(anchor_point, gfx::Size()), | 43 BookmarkBubbleView::ShowBubble(nullptr, gfx::Rect(anchor_point, gfx::Size()), |
43 parent, observer, std::move(delegate), | 44 parent, observer, std::move(delegate), |
44 browser->profile(), url, already_bookmarked); | 45 browser->profile(), url, already_bookmarked); |
45 } | 46 } |
46 | 47 |
48 void ContentSettingBubbleViewsBridge::Show(gfx::NativeView parent_view, | |
49 ContentSettingBubbleModel* model, | |
50 content::WebContents* web_contents, | |
51 const gfx::Point& anchor) { | |
52 ContentSettingBubbleContents* contents = | |
53 new ContentSettingBubbleContents(model, web_contents, nullptr, | |
54 views::BubbleBorder::Arrow::TOP_RIGHT); | |
55 contents->set_parent_window(parent_view); | |
56 contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size())); | |
msw
2016/01/13 18:13:05
fyi: using an empty size here means that if the bu
| |
57 views::BubbleDelegateView::CreateBubble(contents)->Show(); | |
58 } | |
59 | |
47 } // namespace chrome | 60 } // namespace chrome |
OLD | NEW |