diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 07:04:53 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 07:04:53 +0000 |
commit | 7a7a0cacab9a41394be57568930c92963278faa1 (patch) | |
tree | 83530706c3a6e566d21e3b3869f88cc3c9a4b216 /chrome/browser | |
parent | fdcad0db4f765244a04bf2446361477d6f4ecf62 (diff) | |
download | chromium_src-7a7a0cacab9a41394be57568930c92963278faa1.zip chromium_src-7a7a0cacab9a41394be57568930c92963278faa1.tar.gz chromium_src-7a7a0cacab9a41394be57568930c92963278faa1.tar.bz2 |
Rename the bubble initialization method to InitBubble.
No intended functionality change.
BUG=70465,72205
TEST=none
TBR=ben
Review URL: http://codereview.chromium.org/6628005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/chromeos/login/message_bubble.cc | 8 | ||||
-rw-r--r-- | chrome/browser/ui/views/info_bubble.cc | 26 | ||||
-rw-r--r-- | chrome/browser/ui/views/info_bubble.h | 10 | ||||
-rw-r--r-- | chrome/browser/ui/views/pinned_contents_info_bubble.cc | 8 |
4 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index 96a8a1c..b0240ce 100644 --- a/chrome/browser/chromeos/login/message_bubble.cc +++ b/chrome/browser/chromeos/login/message_bubble.cc @@ -114,8 +114,8 @@ MessageBubble* MessageBubble::Show(views::Widget* parent, // The bubble will be destroyed when it is closed. MessageBubble* bubble = new MessageBubble( views::WidgetGtk::TYPE_WINDOW, parent, image, text, help, true, delegate); - bubble->Init(parent, position_relative_to, arrow_location, - bubble->text_->parent(), delegate); + bubble->InitBubble(parent, position_relative_to, arrow_location, + bubble->text_->parent(), delegate); return bubble; } @@ -131,8 +131,8 @@ MessageBubble* MessageBubble::ShowNoGrab( // The bubble will be destroyed when it is closed. MessageBubble* bubble = new MessageBubble( views::WidgetGtk::TYPE_CHILD, parent, image, text, help, false, delegate); - bubble->Init(parent, position_relative_to, arrow_location, - bubble->text_->parent(), delegate); + bubble->InitBubble(parent, position_relative_to, arrow_location, + bubble->text_->parent(), delegate); return bubble; } diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc index 9440a9f..632d750 100644 --- a/chrome/browser/ui/views/info_bubble.cc +++ b/chrome/browser/ui/views/info_bubble.cc @@ -247,10 +247,10 @@ InfoBubble* InfoBubble::Show(views::Widget* parent, BubbleBorder::ArrowLocation arrow_location, views::View* contents, InfoBubbleDelegate* delegate) { - InfoBubble* window = new InfoBubble; - window->Init(parent, position_relative_to, arrow_location, - contents, delegate); - return window; + InfoBubble* bubble = new InfoBubble; + bubble->InitBubble(parent, position_relative_to, arrow_location, + contents, delegate); + return bubble; } #if defined(OS_CHROMEOS) @@ -262,11 +262,11 @@ InfoBubble* InfoBubble::ShowFocusless( views::View* contents, InfoBubbleDelegate* delegate, bool show_while_screen_is_locked) { - InfoBubble* window = new InfoBubble(views::WidgetGtk::TYPE_POPUP, + InfoBubble* bubble = new InfoBubble(views::WidgetGtk::TYPE_POPUP, show_while_screen_is_locked); - window->Init(parent, position_relative_to, arrow_location, - contents, delegate); - return window; + bubble->InitBubble(parent, position_relative_to, arrow_location, + contents, delegate); + return bubble; } #endif @@ -347,11 +347,11 @@ InfoBubble::InfoBubble(views::WidgetGtk::Type type, InfoBubble::~InfoBubble() { } -void InfoBubble::Init(views::Widget* parent, - const gfx::Rect& position_relative_to, - BubbleBorder::ArrowLocation arrow_location, - views::View* contents, - InfoBubbleDelegate* delegate) { +void InfoBubble::InitBubble(views::Widget* parent, + const gfx::Rect& position_relative_to, + BubbleBorder::ArrowLocation arrow_location, + views::View* contents, + InfoBubbleDelegate* delegate) { delegate_ = delegate; position_relative_to_ = position_relative_to; arrow_location_ = arrow_location; diff --git a/chrome/browser/ui/views/info_bubble.h b/chrome/browser/ui/views/info_bubble.h index e57ebc8..36f7998 100644 --- a/chrome/browser/ui/views/info_bubble.h +++ b/chrome/browser/ui/views/info_bubble.h @@ -245,11 +245,11 @@ class InfoBubble virtual ~InfoBubble(); // Creates the InfoBubble. - virtual void Init(views::Widget* parent, - const gfx::Rect& position_relative_to, - BubbleBorder::ArrowLocation arrow_location, - views::View* contents, - InfoBubbleDelegate* delegate); + virtual void InitBubble(views::Widget* parent, + const gfx::Rect& position_relative_to, + BubbleBorder::ArrowLocation arrow_location, + views::View* contents, + InfoBubbleDelegate* delegate); // Instantiates and returns the BorderContents this InfoBubble should use. // Subclasses can return their own BorderContents implementation. diff --git a/chrome/browser/ui/views/pinned_contents_info_bubble.cc b/chrome/browser/ui/views/pinned_contents_info_bubble.cc index 90074f7..6649739 100644 --- a/chrome/browser/ui/views/pinned_contents_info_bubble.cc +++ b/chrome/browser/ui/views/pinned_contents_info_bubble.cc @@ -41,11 +41,11 @@ PinnedContentsInfoBubble* PinnedContentsInfoBubble::Show( const gfx::Point& bubble_anchor, views::View* contents, InfoBubbleDelegate* delegate) { - PinnedContentsInfoBubble* window = + PinnedContentsInfoBubble* bubble = new PinnedContentsInfoBubble(bubble_anchor); - window->Init(parent, position_relative_to, arrow_location, - contents, delegate); - return window; + bubble->InitBubble(parent, position_relative_to, arrow_location, + contents, delegate); + return bubble; } BorderContents* PinnedContentsInfoBubble::CreateBorderContents() { |