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

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_prompt_impl_views.cc

Issue 2328983002: [omnibox] Return reference to ImageView instead of LocationIconView (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/memory/ptr_util.h" 5 #include "base/memory/ptr_util.h"
6 #include "chrome/browser/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "chrome/browser/ui/browser_window.h" 7 #include "chrome/browser/ui/browser_window.h"
8 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" 8 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "chrome/browser/ui/views/frame/top_container_view.h" 10 #include "chrome/browser/ui/views/frame/top_container_view.h"
11 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 11 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
12 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 12 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
13 #include "chrome/browser/ui/views/website_settings/permission_prompt_impl.h" 13 #include "chrome/browser/ui/views/website_settings/permission_prompt_impl.h"
14 #include "ui/gfx/geometry/point.h" 14 #include "ui/gfx/geometry/point.h"
15 #include "ui/gfx/geometry/vector2d.h" 15 #include "ui/gfx/geometry/vector2d.h"
16 #include "ui/views/controls/image_view.h"
16 17
17 // The Views browser implementation of PermissionPromptImpl's 18 // The Views browser implementation of PermissionPromptImpl's
18 // anchor methods. Views browsers have a native View to anchor the bubble to, 19 // anchor methods. Views browsers have a native View to anchor the bubble to,
19 // which these functions provide. 20 // which these functions provide.
20 21
21 // Left margin for the bubble when anchored to the top of the screen in 22 // Left margin for the bubble when anchored to the top of the screen in
22 // fullscreen mode. 23 // fullscreen mode.
23 const int kFullscreenLeftMargin = 40; 24 const int kFullscreenLeftMargin = 40;
24 25
25 views::View* PermissionPromptImpl::GetAnchorView() { 26 views::View* PermissionPromptImpl::GetAnchorView() {
26 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_); 27 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
27 28
28 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) 29 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
29 return browser_view->GetLocationBarView()->location_icon_view(); 30 return browser_view->GetLocationBarView()
31 ->location_icon_view()
32 ->GetImageView();
30 33
31 // Fall back to GetAnchorPoint(). 34 // Fall back to GetAnchorPoint().
32 return nullptr; 35 return nullptr;
33 } 36 }
34 37
35 gfx::Point PermissionPromptImpl::GetAnchorPoint() { 38 gfx::Point PermissionPromptImpl::GetAnchorPoint() {
36 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_); 39 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
37 // Get position in view (taking RTL displays into account). 40 // Get position in view (taking RTL displays into account).
38 int x_within_browser_view = 41 int x_within_browser_view =
39 browser_view->GetMirroredXInView(kFullscreenLeftMargin); 42 browser_view->GetMirroredXInView(kFullscreenLeftMargin);
40 // Get position in screen (taking browser view origin into account, which may 43 // Get position in screen (taking browser view origin into account, which may
41 // not be 0,0 if there are multiple displays). 44 // not be 0,0 if there are multiple displays).
42 gfx::Point browser_view_origin = browser_view->GetBoundsInScreen().origin(); 45 gfx::Point browser_view_origin = browser_view->GetBoundsInScreen().origin();
43 return browser_view_origin + gfx::Vector2d(x_within_browser_view, 0); 46 return browser_view_origin + gfx::Vector2d(x_within_browser_view, 0);
44 } 47 }
45 48
46 views::BubbleBorder::Arrow PermissionPromptImpl::GetAnchorArrow() { 49 views::BubbleBorder::Arrow PermissionPromptImpl::GetAnchorArrow() {
47 return views::BubbleBorder::TOP_LEFT; 50 return views::BubbleBorder::TOP_LEFT;
48 } 51 }
49 52
50 // static 53 // static
51 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(Browser* browser) { 54 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(Browser* browser) {
52 return base::WrapUnique(new PermissionPromptImpl(browser)); 55 return base::WrapUnique(new PermissionPromptImpl(browser));
53 } 56 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698