| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/validation_message_bubble_view.h" | 5 #include "chrome/browser/ui/views/validation_message_bubble_view.h" |
| 6 | 6 |
| 7 #include "chrome/grit/theme_resources.h" | 7 #include "chrome/grit/theme_resources.h" |
| 8 #include "content/public/browser/render_widget_host.h" | 8 #include "content/public/browser/render_widget_host.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "ui/base/layout.h" | |
| 11 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/display/display.h" |
| 12 #include "ui/display/screen.h" |
| 12 #include "ui/views/controls/image_view.h" | 13 #include "ui/views/controls/image_view.h" |
| 13 #include "ui/views/controls/label.h" | 14 #include "ui/views/controls/label.h" |
| 14 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
| 15 | 16 |
| 16 namespace { | 17 namespace { |
| 17 | 18 |
| 18 const int kWindowMinWidth = 64; | 19 const int kWindowMinWidth = 64; |
| 19 const int kWindowMaxWidth = 256; | 20 const int kWindowMaxWidth = 256; |
| 20 const int kIconTextMargin = 8; | 21 const int kIconTextMargin = 8; |
| 21 const int kTextVerticalMargin = 4; | 22 const int kTextVerticalMargin = 4; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 views::BubbleDialogDelegateView::CreateBubble(this)->ShowInactive(); | 80 views::BubbleDialogDelegateView::CreateBubble(this)->ShowInactive(); |
| 80 } | 81 } |
| 81 | 82 |
| 82 ValidationMessageBubbleView::~ValidationMessageBubbleView() { | 83 ValidationMessageBubbleView::~ValidationMessageBubbleView() { |
| 83 } | 84 } |
| 84 | 85 |
| 85 gfx::Rect ValidationMessageBubbleView::RootViewToScreenRect( | 86 gfx::Rect ValidationMessageBubbleView::RootViewToScreenRect( |
| 86 const gfx::Rect& rect_in_root_view, | 87 const gfx::Rect& rect_in_root_view, |
| 87 const content::RenderWidgetHostView* render_widget_host_view) const { | 88 const content::RenderWidgetHostView* render_widget_host_view) const { |
| 88 gfx::NativeView view = render_widget_host_view->GetNativeView(); | 89 gfx::NativeView view = render_widget_host_view->GetNativeView(); |
| 89 const float scale = ui::GetScaleFactorForNativeView(view); | 90 display::Display display = |
| 91 display::Screen::GetScreen()->GetDisplayNearestWindow(view); |
| 92 const float scale = display.device_scale_factor(); |
| 90 return gfx::ScaleToEnclosingRect(rect_in_root_view, 1 / scale) + | 93 return gfx::ScaleToEnclosingRect(rect_in_root_view, 1 / scale) + |
| 91 render_widget_host_view->GetViewBounds().origin().OffsetFromOrigin(); | 94 render_widget_host_view->GetViewBounds().origin().OffsetFromOrigin(); |
| 92 } | 95 } |
| 93 | 96 |
| 94 gfx::Size ValidationMessageBubbleView::GetPreferredSize() const { | 97 gfx::Size ValidationMessageBubbleView::GetPreferredSize() const { |
| 95 return size_; | 98 return size_; |
| 96 } | 99 } |
| 97 | 100 |
| 98 int ValidationMessageBubbleView::GetDialogButtons() const { | 101 int ValidationMessageBubbleView::GetDialogButtons() const { |
| 99 return ui::DIALOG_BUTTON_NONE; | 102 return ui::DIALOG_BUTTON_NONE; |
| 100 } | 103 } |
| 101 | 104 |
| 102 void ValidationMessageBubbleView::SetPositionRelativeToAnchor( | 105 void ValidationMessageBubbleView::SetPositionRelativeToAnchor( |
| 103 content::RenderWidgetHost* widget_host, | 106 content::RenderWidgetHost* widget_host, |
| 104 const gfx::Rect& anchor_in_root_view) { | 107 const gfx::Rect& anchor_in_root_view) { |
| 105 SetAnchorRect( | 108 SetAnchorRect( |
| 106 RootViewToScreenRect(anchor_in_root_view, widget_host->GetView())); | 109 RootViewToScreenRect(anchor_in_root_view, widget_host->GetView())); |
| 107 } | 110 } |
| 108 | 111 |
| 109 void ValidationMessageBubbleView::CloseValidationMessage() { | 112 void ValidationMessageBubbleView::CloseValidationMessage() { |
| 110 GetWidget()->Close(); | 113 GetWidget()->Close(); |
| 111 } | 114 } |
| OLD | NEW |