Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: chrome/browser/ui/views/settings_api_bubble_helper_views.cc

Issue 1858773006: [Extensions UI] Use the ExtensionMessageBubbleBridge for Views platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "chrome/browser/extensions/settings_api_bubble_delegate.h" 11 #include "chrome/browser/extensions/settings_api_bubble_delegate.h"
12 #include "chrome/browser/extensions/settings_api_helpers.h" 12 #include "chrome/browser/extensions/settings_api_helpers.h"
13 #include "chrome/browser/ui/browser_finder.h" 13 #include "chrome/browser/ui/browser_finder.h"
14 #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" 16 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 17 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 18 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
18 #include "chrome/browser/ui/views/toolbar/home_button.h" 19 #include "chrome/browser/ui/views/toolbar/home_button.h"
19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
20 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h" 21 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"
21 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
22 #include "content/public/browser/browser_url_handler.h" 23 #include "content/public/browser/browser_url_handler.h"
23 #include "content/public/browser/navigation_entry.h" 24 #include "content/public/browser/navigation_entry.h"
24 25
25 namespace extensions { 26 namespace extensions {
26 27
27 namespace { 28 namespace {
28 29
29 void ShowSettingsApiBubble(SettingsApiOverrideType type, 30 void ShowSettingsApiBubble(SettingsApiOverrideType type,
30 Browser* browser, 31 Browser* browser,
31 views::View* anchor_view, 32 views::View* anchor_view,
32 views::BubbleBorder::Arrow arrow) { 33 views::BubbleBorder::Arrow arrow) {
33 std::unique_ptr<ExtensionMessageBubbleController> settings_api_bubble( 34 std::unique_ptr<ExtensionMessageBubbleController> settings_api_bubble(
34 new ExtensionMessageBubbleController( 35 new ExtensionMessageBubbleController(
35 new SettingsApiBubbleDelegate(browser->profile(), type), browser)); 36 new SettingsApiBubbleDelegate(browser->profile(), type), browser));
36 if (!settings_api_bubble->ShouldShow()) 37 if (!settings_api_bubble->ShouldShow())
37 return; 38 return;
38 39
39 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( 40 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView(
40 anchor_view, arrow, std::move(settings_api_bubble)); 41 anchor_view, arrow,
42 std::unique_ptr<ToolbarActionsBarBubbleDelegate>(
43 new ExtensionMessageBubbleBridge(std::move(settings_api_bubble))));
41 views::BubbleDelegateView::CreateBubble(bubble); 44 views::BubbleDelegateView::CreateBubble(bubble);
42 bubble->Show(); 45 bubble->Show();
43 } 46 }
44 47
45 } // namespace 48 } // namespace
46 49
47 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { 50 void MaybeShowExtensionControlledHomeNotification(Browser* browser) {
48 #if !defined(OS_WIN) 51 #if !defined(OS_WIN)
49 return; 52 return;
50 #endif 53 #endif
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 std::unique_ptr<ExtensionMessageBubbleController> ntp_overridden_bubble( 107 std::unique_ptr<ExtensionMessageBubbleController> ntp_overridden_bubble(
105 new ExtensionMessageBubbleController( 108 new ExtensionMessageBubbleController(
106 new NtpOverriddenBubbleDelegate(browser->profile()), browser)); 109 new NtpOverriddenBubbleDelegate(browser->profile()), browser));
107 if (!ntp_overridden_bubble->ShouldShow()) 110 if (!ntp_overridden_bubble->ShouldShow())
108 return; 111 return;
109 112
110 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView( 113 ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView(
111 BrowserView::GetBrowserViewForBrowser(browser) 114 BrowserView::GetBrowserViewForBrowser(browser)
112 ->toolbar() 115 ->toolbar()
113 ->app_menu_button(), 116 ->app_menu_button(),
114 views::BubbleBorder::TOP_RIGHT, std::move(ntp_overridden_bubble)); 117 views::BubbleBorder::TOP_RIGHT,
118 std::unique_ptr<ToolbarActionsBarBubbleDelegate>(
119 new ExtensionMessageBubbleBridge(std::move(ntp_overridden_bubble))));
115 views::BubbleDelegateView::CreateBubble(bubble); 120 views::BubbleDelegateView::CreateBubble(bubble);
116 bubble->Show(); 121 bubble->Show();
117 } 122 }
118 123
119 } // namespace extensions 124 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698