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

Side by Side Diff: status_bubble_views.cc

Issue 159755: Fix compile error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/chrome/browser/views/
Patch Set: Created 11 years, 4 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 | Annotate | Revision Log
« 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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/status_bubble_views.h" 5 #include "chrome/browser/views/status_bubble_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/gfx/canvas.h" 9 #include "app/gfx/canvas.h"
10 #include "app/gfx/text_elider.h" 10 #include "app/gfx/text_elider.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // View ----------------------------------------------------------------------- 58 // View -----------------------------------------------------------------------
59 // StatusView manages the display of the bubble, applying text changes and 59 // StatusView manages the display of the bubble, applying text changes and
60 // fading in or out the bubble as required. 60 // fading in or out the bubble as required.
61 class StatusBubbleViews::StatusView : public views::Label, 61 class StatusBubbleViews::StatusView : public views::Label,
62 public Animation, 62 public Animation,
63 public AnimationDelegate { 63 public AnimationDelegate {
64 public: 64 public:
65 StatusView(StatusBubble* status_bubble, views::Widget* popup, 65 StatusView(StatusBubble* status_bubble, views::Widget* popup,
66 ThemeProvider* theme_provider) 66 ThemeProvider* theme_provider)
67 : Animation(kFramerate, this), 67 : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(kFramerate, this)),
68 stage_(BUBBLE_HIDDEN), 68 stage_(BUBBLE_HIDDEN),
69 style_(STYLE_STANDARD), 69 style_(STYLE_STANDARD),
70 ALLOW_THIS_IN_INITIALIZER_LIST(timer_factory_(this)), 70 ALLOW_THIS_IN_INITIALIZER_LIST(timer_factory_(this)),
71 status_bubble_(status_bubble), 71 status_bubble_(status_bubble),
72 popup_(popup), 72 popup_(popup),
73 opacity_start_(0), 73 opacity_start_(0),
74 opacity_end_(0), 74 opacity_end_(0),
75 theme_provider_(theme_provider) { 75 theme_provider_(theme_provider) {
76 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 76 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
77 gfx::Font font(rb.GetFont(ResourceBundle::BaseFont)); 77 gfx::Font font(rb.GetFont(ResourceBundle::BaseFont));
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 } 651 }
652 } else if (offset_ != 0 || 652 } else if (offset_ != 0 ||
653 view_->GetStyle() == StatusView::STYLE_STANDARD_RIGHT) { 653 view_->GetStyle() == StatusView::STYLE_STANDARD_RIGHT) {
654 offset_ = 0; 654 offset_ = 0;
655 view_->SetStyle(StatusView::STYLE_STANDARD); 655 view_->SetStyle(StatusView::STYLE_STANDARD);
656 popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), 656 popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(),
657 top_left.y() + position_.y(), 657 top_left.y() + position_.y(),
658 size_.width(), size_.height())); 658 size_.width(), size_.height()));
659 } 659 }
660 } 660 }
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