| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/status_bubble_views.h" | 5 #include "chrome/browser/ui/views/status_bubble_views.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 views::Widget* frame = base_view_->GetWidget(); | 568 views::Widget* frame = base_view_->GetWidget(); |
| 569 if (!view_) | 569 if (!view_) |
| 570 view_ = new StatusView(this, popup_.get(), frame->GetThemeProvider()); | 570 view_ = new StatusView(this, popup_.get(), frame->GetThemeProvider()); |
| 571 if (!expand_view_.get()) | 571 if (!expand_view_.get()) |
| 572 expand_view_.reset(new StatusViewExpander(this, view_)); | 572 expand_view_.reset(new StatusViewExpander(this, view_)); |
| 573 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); | 573 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); |
| 574 params.transparent = true; | 574 params.transparent = true; |
| 575 params.accept_events = false; | 575 params.accept_events = false; |
| 576 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 576 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 577 params.parent_widget = frame; | 577 params.parent_widget = frame; |
| 578 params.context = frame->GetNativeView(); |
| 578 popup_->Init(params); | 579 popup_->Init(params); |
| 579 // We do our own animation and don't want any from the system. | 580 // We do our own animation and don't want any from the system. |
| 580 popup_->SetVisibilityChangedAnimationsEnabled(false); | 581 popup_->SetVisibilityChangedAnimationsEnabled(false); |
| 581 popup_->SetOpacity(0x00); | 582 popup_->SetOpacity(0x00); |
| 582 popup_->SetContentsView(view_); | 583 popup_->SetContentsView(view_); |
| 583 #if defined(USE_ASH) | 584 #if defined(USE_ASH) |
| 584 ash::SetIgnoredByShelf(popup_->GetNativeWindow(), true); | 585 ash::SetIgnoredByShelf(popup_->GetNativeWindow(), true); |
| 585 #endif | 586 #endif |
| 586 Reposition(); | 587 Reposition(); |
| 587 } | 588 } |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 842 void StatusBubbleViews::SetBubbleWidth(int width) { | 843 void StatusBubbleViews::SetBubbleWidth(int width) { |
| 843 size_.set_width(width); | 844 size_.set_width(width); |
| 844 SetBounds(original_position_.x(), original_position_.y(), | 845 SetBounds(original_position_.x(), original_position_.y(), |
| 845 size_.width(), size_.height()); | 846 size_.width(), size_.height()); |
| 846 } | 847 } |
| 847 | 848 |
| 848 void StatusBubbleViews::CancelExpandTimer() { | 849 void StatusBubbleViews::CancelExpandTimer() { |
| 849 if (expand_timer_factory_.HasWeakPtrs()) | 850 if (expand_timer_factory_.HasWeakPtrs()) |
| 850 expand_timer_factory_.InvalidateWeakPtrs(); | 851 expand_timer_factory_.InvalidateWeakPtrs(); |
| 851 } | 852 } |
| OLD | NEW |