| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" | 10 #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 return; | 38 return; |
| 39 | 39 |
| 40 // TODO(devlin): This should go through the ToolbarActionsBar. | 40 // TODO(devlin): This should go through the ToolbarActionsBar. |
| 41 ToolbarActionsBarBubbleViews* bubble = | 41 ToolbarActionsBarBubbleViews* bubble = |
| 42 new ToolbarActionsBarBubbleViews( | 42 new ToolbarActionsBarBubbleViews( |
| 43 anchor_view, | 43 anchor_view, |
| 44 scoped_ptr<ToolbarActionsBarBubbleDelegate>( | 44 scoped_ptr<ToolbarActionsBarBubbleDelegate>( |
| 45 new ExtensionMessageBubbleBridge( | 45 new ExtensionMessageBubbleBridge( |
| 46 std::move(settings_api_bubble)))); | 46 std::move(settings_api_bubble)))); |
| 47 bubble->set_arrow(arrow); | 47 bubble->set_arrow(arrow); |
| 48 views::BubbleDelegateView::CreateBubble(bubble); | 48 views::BubbleDialogDelegateView::CreateBubble(bubble); |
| 49 bubble->Show(); | 49 bubble->Show(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace | 52 } // namespace |
| 53 | 53 |
| 54 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { | 54 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { |
| 55 #if !defined(OS_WIN) | 55 #if !defined(OS_WIN) |
| 56 return; | 56 return; |
| 57 #endif | 57 #endif |
| 58 | 58 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 return; | 115 return; |
| 116 | 116 |
| 117 ToolbarActionsBarBubbleViews* bubble = | 117 ToolbarActionsBarBubbleViews* bubble = |
| 118 new ToolbarActionsBarBubbleViews( | 118 new ToolbarActionsBarBubbleViews( |
| 119 BrowserView::GetBrowserViewForBrowser(browser) | 119 BrowserView::GetBrowserViewForBrowser(browser) |
| 120 ->toolbar() | 120 ->toolbar() |
| 121 ->app_menu_button(), | 121 ->app_menu_button(), |
| 122 std::unique_ptr<ToolbarActionsBarBubbleDelegate>( | 122 std::unique_ptr<ToolbarActionsBarBubbleDelegate>( |
| 123 new ExtensionMessageBubbleBridge(std::move(ntp_overridden_bubble)))); | 123 new ExtensionMessageBubbleBridge(std::move(ntp_overridden_bubble)))); |
| 124 bubble->set_arrow(views::BubbleBorder::TOP_RIGHT); | 124 bubble->set_arrow(views::BubbleBorder::TOP_RIGHT); |
| 125 views::BubbleDelegateView::CreateBubble(bubble); | 125 views::BubbleDialogDelegateView::CreateBubble(bubble); |
| 126 bubble->Show(); | 126 bubble->Show(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 } // namespace extensions | 129 } // namespace extensions |
| OLD | NEW |