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

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: merge 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 if (cancel_button.get()) 116 if (cancel_button.get())
117 layout->AddView(cancel_button.release()); 117 layout->AddView(cancel_button.release());
118 118
119 // Adjust the message label size in case buttons are too long. 119 // Adjust the message label size in case buttons are too long.
120 message_label->SizeToFit(layout->GetPreferredSize(this).width()); 120 message_label->SizeToFit(layout->GetPreferredSize(this).width());
121 } 121 }
122 122
123 GlobalErrorBubbleView::~GlobalErrorBubbleView() { 123 GlobalErrorBubbleView::~GlobalErrorBubbleView() {
124 } 124 }
125 125
126 gfx::Point GlobalErrorBubbleView::GetAnchorPoint() { 126 gfx::Rect GlobalErrorBubbleView::GetAnchorRect() {
127 return (views::BubbleDelegateView::GetAnchorPoint().Add( 127 gfx::Rect rect(views::BubbleDelegateView::GetAnchorRect());
128 gfx::Point(0, anchor_view() ? kWrenchBubblePointOffsetY : 0))); 128 rect.Offset(0, anchor_view() ? kWrenchBubblePointOffsetY : 0);
129 return rect;
129 } 130 }
130 131
131 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender, 132 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender,
132 const views::Event& event) { 133 const views::Event& event) {
133 if (sender->tag() == TAG_ACCEPT_BUTTON) 134 if (sender->tag() == TAG_ACCEPT_BUTTON)
134 error_->BubbleViewAcceptButtonPressed(); 135 error_->BubbleViewAcceptButtonPressed();
135 else if (sender->tag() == TAG_CANCEL_BUTTON) 136 else if (sender->tag() == TAG_CANCEL_BUTTON)
136 error_->BubbleViewCancelButtonPressed(); 137 error_->BubbleViewCancelButtonPressed();
137 else 138 else
138 NOTREACHED(); 139 NOTREACHED();
139 GetWidget()->Close(); 140 GetWidget()->Close();
140 } 141 }
141 142
142 void GlobalErrorBubbleView::WindowClosing() { 143 void GlobalErrorBubbleView::WindowClosing() {
143 error_->BubbleViewDidClose(); 144 error_->BubbleViewDidClose();
144 } 145 }
145 146
146 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) { 147 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) {
147 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); 148 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
148 views::View* wrench_button = browser_view->toolbar()->app_menu(); 149 views::View* wrench_button = browser_view->toolbar()->app_menu();
149 GlobalErrorBubbleView* bubble_view = 150 GlobalErrorBubbleView* bubble_view =
150 new GlobalErrorBubbleView(wrench_button, 151 new GlobalErrorBubbleView(wrench_button,
151 views::BubbleBorder::TOP_RIGHT, 152 views::BubbleBorder::TOP_RIGHT,
152 browser, 153 browser,
153 error); 154 error);
154 browser::CreateViewsBubble(bubble_view); 155 browser::CreateViewsBubble(bubble_view);
155 bubble_view->StartFade(true); 156 bubble_view->StartFade(true);
156 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/global_error_bubble_view.h ('k') | chrome/browser/ui/views/page_info_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698