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

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

Issue 2893573004: Simplify some code in c/b/u/views. (Closed)
Patch Set: Created 3 years, 7 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 | « chrome/browser/ui/views/validation_message_bubble_view.h ('k') | 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 (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" 10 #include "ui/base/layout.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 int content_bottom = label->height(); 68 int content_bottom = label->height();
69 69
70 if (sub_label) { 70 if (sub_label) {
71 sub_label->SetBounds(text_start_x, 71 sub_label->SetBounds(text_start_x,
72 content_bottom + kTextVerticalMargin, 72 content_bottom + kTextVerticalMargin,
73 label_width, 73 label_width,
74 sub_label->GetHeightForWidth(label_width)); 74 sub_label->GetHeightForWidth(label_width));
75 content_bottom += kTextVerticalMargin + sub_label->height(); 75 content_bottom += kTextVerticalMargin + sub_label->height();
76 } 76 }
77 77
78 size_ = gfx::Size(text_start_x + label_width, content_bottom); 78 set_preferred_size(gfx::Size(text_start_x + label_width, content_bottom));
79 79
80 views::BubbleDialogDelegateView::CreateBubble(this)->ShowInactive(); 80 views::BubbleDialogDelegateView::CreateBubble(this)->ShowInactive();
81 } 81 }
82 82
83 ValidationMessageBubbleView::~ValidationMessageBubbleView() { 83 ValidationMessageBubbleView::~ValidationMessageBubbleView() {
84 } 84 }
85 85
86 gfx::Rect ValidationMessageBubbleView::RootViewToScreenRect( 86 gfx::Rect ValidationMessageBubbleView::RootViewToScreenRect(
87 const gfx::Rect& rect_in_root_view, 87 const gfx::Rect& rect_in_root_view,
88 const content::RenderWidgetHostView* render_widget_host_view) const { 88 const content::RenderWidgetHostView* render_widget_host_view) const {
89 gfx::NativeView view = render_widget_host_view->GetNativeView(); 89 gfx::NativeView view = render_widget_host_view->GetNativeView();
90 const float scale = ui::GetScaleFactorForNativeView(view); 90 const float scale = ui::GetScaleFactorForNativeView(view);
91 return gfx::ScaleToEnclosingRect(rect_in_root_view, 1 / scale) + 91 return gfx::ScaleToEnclosingRect(rect_in_root_view, 1 / scale) +
92 render_widget_host_view->GetViewBounds().origin().OffsetFromOrigin(); 92 render_widget_host_view->GetViewBounds().origin().OffsetFromOrigin();
93 } 93 }
94 94
95 gfx::Size ValidationMessageBubbleView::GetPreferredSize() const {
96 return size_;
97 }
98
99 int ValidationMessageBubbleView::GetDialogButtons() const { 95 int ValidationMessageBubbleView::GetDialogButtons() const {
100 return ui::DIALOG_BUTTON_NONE; 96 return ui::DIALOG_BUTTON_NONE;
101 } 97 }
102 98
103 void ValidationMessageBubbleView::SetPositionRelativeToAnchor( 99 void ValidationMessageBubbleView::SetPositionRelativeToAnchor(
104 content::RenderWidgetHost* widget_host, 100 content::RenderWidgetHost* widget_host,
105 const gfx::Rect& anchor_in_root_view) { 101 const gfx::Rect& anchor_in_root_view) {
106 SetAnchorRect( 102 SetAnchorRect(
107 RootViewToScreenRect(anchor_in_root_view, widget_host->GetView())); 103 RootViewToScreenRect(anchor_in_root_view, widget_host->GetView()));
108 } 104 }
109 105
110 void ValidationMessageBubbleView::CloseValidationMessage() { 106 void ValidationMessageBubbleView::CloseValidationMessage() {
111 GetWidget()->Close(); 107 GetWidget()->Close();
112 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/validation_message_bubble_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698