summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 05:42:25 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 05:42:25 +0000
commit6a3df747de1b85057584a1e31b8857fe0908bc29 (patch)
tree4ab887b299472f51b29ee14f900478a56c4edb2b /chrome/browser
parent04ac6e874adc7e00269b7f3bab879d3d93530184 (diff)
downloadchromium_src-6a3df747de1b85057584a1e31b8857fe0908bc29.zip
chromium_src-6a3df747de1b85057584a1e31b8857fe0908bc29.tar.gz
chromium_src-6a3df747de1b85057584a1e31b8857fe0908bc29.tar.bz2
Remove WindowGtk::Init() to InitWindow().
This makes it clear that this is not an intended override of WidgetGtk::Init(). No intended functionality change. BUG=70465,72205 TEST=none TBR=ben git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/frame/bubble_window.cc4
-rw-r--r--chrome/browser/chromeos/frame/bubble_window.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window.cc
index 6d3f3bb..132295a 100644
--- a/chrome/browser/chromeos/frame/bubble_window.cc
+++ b/chrome/browser/chromeos/frame/bubble_window.cc
@@ -31,8 +31,8 @@ BubbleWindow::BubbleWindow(views::WindowDelegate* window_delegate)
MakeTransparent();
}
-void BubbleWindow::Init(GtkWindow* parent, const gfx::Rect& bounds) {
- views::WindowGtk::Init(parent, bounds);
+void BubbleWindow::InitWindow(GtkWindow* parent, const gfx::Rect& bounds) {
+ views::WindowGtk::InitWindow(parent, bounds);
// Turn on double buffering so that the hosted GtkWidgets does not
// flash as in http://crosbug.com/9065.
diff --git a/chrome/browser/chromeos/frame/bubble_window.h b/chrome/browser/chromeos/frame/bubble_window.h
index 2a045e6..c57e204 100644
--- a/chrome/browser/chromeos/frame/bubble_window.h
+++ b/chrome/browser/chromeos/frame/bubble_window.h
@@ -41,7 +41,7 @@ class BubbleWindow : public views::WindowGtk {
explicit BubbleWindow(views::WindowDelegate* window_delegate);
// Overidden from views::WindowGtk:
- virtual void Init(GtkWindow* parent, const gfx::Rect& bounds);
+ virtual void InitWindow(GtkWindow* parent, const gfx::Rect& bounds);
// Trims the window margins and rounds off the corners.
void TrimMargins(int margin_left, int margin_right, int margin_top,