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

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

Issue 657333002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "chrome/browser/extensions/ntp_overridden_bubble_controller.h" 7 #include "chrome/browser/extensions/ntp_overridden_bubble_controller.h"
8 #include "chrome/browser/extensions/settings_api_bubble_controller.h" 8 #include "chrome/browser/extensions/settings_api_bubble_controller.h"
9 #include "chrome/browser/extensions/settings_api_helpers.h" 9 #include "chrome/browser/extensions/settings_api_helpers.h"
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
(...skipping 16 matching lines...) Expand all
27 const std::string& extension_id, 27 const std::string& extension_id,
28 Profile* profile, 28 Profile* profile,
29 views::View* anchor_view, 29 views::View* anchor_view,
30 views::BubbleBorder::Arrow arrow) { 30 views::BubbleBorder::Arrow arrow) {
31 scoped_ptr<SettingsApiBubbleController> settings_api_bubble( 31 scoped_ptr<SettingsApiBubbleController> settings_api_bubble(
32 new SettingsApiBubbleController(profile, type)); 32 new SettingsApiBubbleController(profile, type));
33 if (!settings_api_bubble->ShouldShow(extension_id)) 33 if (!settings_api_bubble->ShouldShow(extension_id))
34 return; 34 return;
35 35
36 SettingsApiBubbleController* controller = settings_api_bubble.get(); 36 SettingsApiBubbleController* controller = settings_api_bubble.get();
37 ExtensionMessageBubbleView* bubble_delegate = 37 ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView(
38 new ExtensionMessageBubbleView( 38 anchor_view, arrow, settings_api_bubble.Pass());
39 anchor_view,
40 arrow,
41 settings_api_bubble.PassAs<
42 ExtensionMessageBubbleController>());
43 views::BubbleDelegateView::CreateBubble(bubble_delegate); 39 views::BubbleDelegateView::CreateBubble(bubble_delegate);
44 controller->Show(bubble_delegate); 40 controller->Show(bubble_delegate);
45 } 41 }
46 42
47 } // namespace 43 } // namespace
48 44
49 void MaybeShowExtensionControlledHomeNotification(Browser* browser) { 45 void MaybeShowExtensionControlledHomeNotification(Browser* browser) {
50 #if !defined(OS_WIN) 46 #if !defined(OS_WIN)
51 return; 47 return;
52 #endif 48 #endif
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 &ignored_param); 108 &ignored_param);
113 if (ntp_url != active_url) 109 if (ntp_url != active_url)
114 return; // Not being overridden by an extension. 110 return; // Not being overridden by an extension.
115 111
116 scoped_ptr<NtpOverriddenBubbleController> ntp_overridden_bubble( 112 scoped_ptr<NtpOverriddenBubbleController> ntp_overridden_bubble(
117 new NtpOverriddenBubbleController(browser->profile())); 113 new NtpOverriddenBubbleController(browser->profile()));
118 if (!ntp_overridden_bubble->ShouldShow(ntp_url.host())) 114 if (!ntp_overridden_bubble->ShouldShow(ntp_url.host()))
119 return; 115 return;
120 116
121 NtpOverriddenBubbleController* controller = ntp_overridden_bubble.get(); 117 NtpOverriddenBubbleController* controller = ntp_overridden_bubble.get();
122 ExtensionMessageBubbleView* bubble_delegate = 118 ExtensionMessageBubbleView* bubble_delegate = new ExtensionMessageBubbleView(
123 new ExtensionMessageBubbleView( 119 BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(),
124 BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(), 120 views::BubbleBorder::TOP_RIGHT,
125 views::BubbleBorder::TOP_RIGHT, 121 ntp_overridden_bubble.Pass());
126 ntp_overridden_bubble.PassAs<
127 ExtensionMessageBubbleController>());
128 views::BubbleDelegateView::CreateBubble(bubble_delegate); 122 views::BubbleDelegateView::CreateBubble(bubble_delegate);
129 controller->Show(bubble_delegate); 123 controller->Show(bubble_delegate);
130 } 124 }
131 125
132 } // namespace extensions 126 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/new_avatar_button.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698