| OLD | NEW |
| 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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 popup->set_delete_on_destroy(false); | 474 popup->set_delete_on_destroy(false); |
| 475 | 475 |
| 476 if (!view_) | 476 if (!view_) |
| 477 view_ = new StatusView(this, popup); | 477 view_ = new StatusView(this, popup); |
| 478 | 478 |
| 479 popup->set_window_style(WS_POPUP); | 479 popup->set_window_style(WS_POPUP); |
| 480 popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | | 480 popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | |
| 481 WS_EX_TRANSPARENT | | 481 WS_EX_TRANSPARENT | |
| 482 l10n_util::GetExtendedTooltipStyles()); | 482 l10n_util::GetExtendedTooltipStyles()); |
| 483 popup->SetOpacity(0x00); | 483 popup->SetOpacity(0x00); |
| 484 popup->Init(frame_->GetNativeView(), gfx::Rect()); | 484 popup->Init(frame_->GetNativeView(), gfx::Rect(), false); |
| 485 popup->SetContentsView(view_); | 485 popup->SetContentsView(view_); |
| 486 Reposition(); | 486 Reposition(); |
| 487 popup->Show(); | 487 popup->Show(); |
| 488 popup_.reset(popup); | 488 popup_.reset(popup); |
| 489 #else | 489 #else |
| 490 NOTIMPLEMENTED(); | 490 NOTIMPLEMENTED(); |
| 491 #endif | 491 #endif |
| 492 } | 492 } |
| 493 } | 493 } |
| 494 | 494 |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 684 } | 684 } |
| 685 } else if (offset_ != 0 || | 685 } else if (offset_ != 0 || |
| 686 view_->GetStyle() == StatusView::STYLE_STANDARD_RIGHT) { | 686 view_->GetStyle() == StatusView::STYLE_STANDARD_RIGHT) { |
| 687 offset_ = 0; | 687 offset_ = 0; |
| 688 view_->SetStyle(StatusView::STYLE_STANDARD); | 688 view_->SetStyle(StatusView::STYLE_STANDARD); |
| 689 popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), | 689 popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), |
| 690 top_left.y() + position_.y(), | 690 top_left.y() + position_.y(), |
| 691 size_.width(), size_.height())); | 691 size_.width(), size_.height())); |
| 692 } | 692 } |
| 693 } | 693 } |
| OLD | NEW |