OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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/settings_api_bubble_helper_views.h" | 5 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "build/build_config.h" | 9 #include "build/build_config.h" |
8 #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" | 10 #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" |
9 #include "chrome/browser/extensions/settings_api_bubble_delegate.h" | 11 #include "chrome/browser/extensions/settings_api_bubble_delegate.h" |
10 #include "chrome/browser/extensions/settings_api_helpers.h" | 12 #include "chrome/browser/extensions/settings_api_helpers.h" |
11 #include "chrome/browser/ui/browser_finder.h" | 13 #include "chrome/browser/ui/browser_finder.h" |
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
13 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" | 15 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" |
14 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
15 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" | 17 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" |
16 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" | 18 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
(...skipping 12 matching lines...) Expand all Loading... |
29 Browser* browser, | 31 Browser* browser, |
30 views::View* anchor_view, | 32 views::View* anchor_view, |
31 views::BubbleBorder::Arrow arrow) { | 33 views::BubbleBorder::Arrow arrow) { |
32 scoped_ptr<ExtensionMessageBubbleController> settings_api_bubble( | 34 scoped_ptr<ExtensionMessageBubbleController> settings_api_bubble( |
33 new ExtensionMessageBubbleController( | 35 new ExtensionMessageBubbleController( |
34 new SettingsApiBubbleDelegate(browser->profile(), type), browser)); | 36 new SettingsApiBubbleDelegate(browser->profile(), type), browser)); |
35 if (!settings_api_bubble->ShouldShow()) | 37 if (!settings_api_bubble->ShouldShow()) |
36 return; | 38 return; |
37 | 39 |
38 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( | 40 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( |
39 anchor_view, arrow, settings_api_bubble.Pass()); | 41 anchor_view, arrow, std::move(settings_api_bubble)); |
40 views::BubbleDelegateView::CreateBubble(bubble); | 42 views::BubbleDelegateView::CreateBubble(bubble); |
41 bubble->Show(); | 43 bubble->Show(); |
42 } | 44 } |
43 | 45 |
44 } // namespace | 46 } // namespace |
45 | 47 |
46 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { | 48 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { |
47 #if !defined(OS_WIN) | 49 #if !defined(OS_WIN) |
48 return; | 50 return; |
49 #endif | 51 #endif |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 scoped_ptr<ExtensionMessageBubbleController> ntp_overridden_bubble( | 105 scoped_ptr<ExtensionMessageBubbleController> ntp_overridden_bubble( |
104 new ExtensionMessageBubbleController( | 106 new ExtensionMessageBubbleController( |
105 new NtpOverriddenBubbleDelegate(browser->profile()), browser)); | 107 new NtpOverriddenBubbleDelegate(browser->profile()), browser)); |
106 if (!ntp_overridden_bubble->ShouldShow()) | 108 if (!ntp_overridden_bubble->ShouldShow()) |
107 return; | 109 return; |
108 | 110 |
109 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( | 111 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( |
110 BrowserView::GetBrowserViewForBrowser(browser) | 112 BrowserView::GetBrowserViewForBrowser(browser) |
111 ->toolbar() | 113 ->toolbar() |
112 ->app_menu_button(), | 114 ->app_menu_button(), |
113 views::BubbleBorder::TOP_RIGHT, ntp_overridden_bubble.Pass()); | 115 views::BubbleBorder::TOP_RIGHT, std::move(ntp_overridden_bubble)); |
114 views::BubbleDelegateView::CreateBubble(bubble); | 116 views::BubbleDelegateView::CreateBubble(bubble); |
115 bubble->Show(); | 117 bubble->Show(); |
116 } | 118 } |
117 | 119 |
118 } // namespace extensions | 120 } // namespace extensions |
OLD | NEW |