summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/info_bubble.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 23:51:38 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 23:51:38 +0000
commitc2dacc9ec41232903ba700c6aef5ef98bfcb8af8 (patch)
tree4aa4d7100862c64bdd92d70e6323001beb19edb7 /chrome/browser/views/info_bubble.cc
parentd66e710ec668e34271def44d7f0416260657171c (diff)
downloadchromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.zip
chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.gz
chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.bz2
Rename ChromeViews namespace to views
http://crbug.com/2188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/info_bubble.cc')
-rw-r--r--chrome/browser/views/info_bubble.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index d059af4..f2b9b27 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -14,7 +14,7 @@
#include "chrome/common/win_util.h"
#include "chrome/views/root_view.h"
-using ChromeViews::View;
+using views::View;
// All sizes are in pixels.
@@ -67,7 +67,7 @@ static const int kMinimumAlpha = 72;
// static
InfoBubble* InfoBubble::Show(HWND parent_hwnd,
const gfx::Rect& position_relative_to,
- ChromeViews::View* content,
+ views::View* content,
InfoBubbleDelegate* delegate) {
InfoBubble* window = new InfoBubble();
window->Init(parent_hwnd, position_relative_to, content);
@@ -87,7 +87,7 @@ InfoBubble::~InfoBubble() {
void InfoBubble::Init(HWND parent_hwnd,
const gfx::Rect& position_relative_to,
- ChromeViews::View* content) {
+ views::View* content) {
if (kInfoBubbleCornerTopLeft == NULL) {
kInfoBubbleCornerTopLeft = ResourceBundle::GetSharedInstance()
.GetBitmapNamed(IDR_INFO_BUBBLE_CORNER_TOP_LEFT);
@@ -128,11 +128,10 @@ void InfoBubble::Init(HWND parent_hwnd,
}
// Register the Escape accelerator for closing.
- ChromeViews::FocusManager* focus_manager =
- ChromeViews::FocusManager::GetFocusManager(GetHWND());
- focus_manager->RegisterAccelerator(ChromeViews::Accelerator(VK_ESCAPE,
- false, false,
- false),
+ views::FocusManager* focus_manager =
+ views::FocusManager::GetFocusManager(GetHWND());
+ focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false,
+ false, false),
this);
fade_animation_.reset(new SlideAnimation(this));
@@ -161,8 +160,7 @@ void InfoBubble::AnimationProgressed(const Animation* animation) {
content_view_->SchedulePaint();
}
-bool InfoBubble::AcceleratorPressed(
- const ChromeViews::Accelerator& accelerator) {
+bool InfoBubble::AcceleratorPressed(const views::Accelerator& accelerator) {
DCHECK(accelerator.GetKeyCode() == VK_ESCAPE);
if (!delegate_ || delegate_->CloseOnEscape()) {
Close();
@@ -203,8 +201,7 @@ BrowserWindow* InfoBubble::GetHostingWindow() {
// ContentView ----------------------------------------------------------------
-InfoBubble::ContentView::ContentView(ChromeViews::View* content,
- InfoBubble* host)
+InfoBubble::ContentView::ContentView(views::View* content, InfoBubble* host)
: host_(host) {
if (UILayoutIsRightToLeft()) {
arrow_edge_ = TOP_RIGHT;