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

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

Issue 8863009: Fix alignment of avatar bubbles in the NTP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use Rect::Ofset() Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/global_error_bubble_view.h" 5 #include "chrome/browser/ui/views/global_error_bubble_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/global_error.h" 8 #include "chrome/browser/ui/global_error.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/toolbar_view.h" 10 #include "chrome/browser/ui/views/toolbar_view.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 if (cancel_button.get()) 117 if (cancel_button.get())
118 layout->AddView(cancel_button.release()); 118 layout->AddView(cancel_button.release());
119 119
120 // Adjust the message label size in case buttons are too long. 120 // Adjust the message label size in case buttons are too long.
121 message_label->SizeToFit(layout->GetPreferredSize(this).width()); 121 message_label->SizeToFit(layout->GetPreferredSize(this).width());
122 } 122 }
123 123
124 GlobalErrorBubbleView::~GlobalErrorBubbleView() { 124 GlobalErrorBubbleView::~GlobalErrorBubbleView() {
125 } 125 }
126 126
127 gfx::Point GlobalErrorBubbleView::GetAnchorPoint() { 127 gfx::Rect GlobalErrorBubbleView::GetAnchorRect() {
128 return (views::BubbleDelegateView::GetAnchorPoint().Add( 128 gfx::Rect rect(views::BubbleDelegateView::GetAnchorRect());
129 gfx::Point(0, anchor_view() ? kWrenchBubblePointOffsetY : 0))); 129 rect.Offset(0, anchor_view() ? kWrenchBubblePointOffsetY : 0);
msw 2011/12/08 00:40:14 Please change this to: rect.Inset(0, anchor_view()
130 return rect;
130 } 131 }
131 132
132 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender, 133 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender,
133 const views::Event& event) { 134 const views::Event& event) {
134 if (sender->tag() == TAG_ACCEPT_BUTTON) 135 if (sender->tag() == TAG_ACCEPT_BUTTON)
135 error_->BubbleViewAcceptButtonPressed(); 136 error_->BubbleViewAcceptButtonPressed();
136 else if (sender->tag() == TAG_CANCEL_BUTTON) 137 else if (sender->tag() == TAG_CANCEL_BUTTON)
137 error_->BubbleViewCancelButtonPressed(); 138 error_->BubbleViewCancelButtonPressed();
138 else 139 else
139 NOTREACHED(); 140 NOTREACHED();
140 GetWidget()->Close(); 141 GetWidget()->Close();
141 } 142 }
142 143
143 void GlobalErrorBubbleView::WindowClosing() { 144 void GlobalErrorBubbleView::WindowClosing() {
144 error_->BubbleViewDidClose(); 145 error_->BubbleViewDidClose();
145 } 146 }
146 147
147 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) { 148 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) {
148 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); 149 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
149 views::View* wrench_button = browser_view->toolbar()->app_menu(); 150 views::View* wrench_button = browser_view->toolbar()->app_menu();
150 GlobalErrorBubbleView* bubble_view = 151 GlobalErrorBubbleView* bubble_view =
151 new GlobalErrorBubbleView(wrench_button, 152 new GlobalErrorBubbleView(wrench_button,
152 views::BubbleBorder::TOP_RIGHT, 153 views::BubbleBorder::TOP_RIGHT,
153 SK_ColorWHITE, 154 SK_ColorWHITE,
154 browser, 155 browser,
155 error); 156 error);
156 browser::CreateViewsBubble(bubble_view); 157 browser::CreateViewsBubble(bubble_view);
157 bubble_view->StartFade(true); 158 bubble_view->StartFade(true);
158 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698