summaryrefslogtreecommitdiffstats
path: root/views/window
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 /views/window
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 'views/window')
-rw-r--r--views/window/window_gtk.cc4
-rw-r--r--views/window/window_gtk.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 7e1e634..fdf4f50 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -87,7 +87,7 @@ Window* Window::CreateChromeWindow(gfx::NativeWindow parent,
WindowDelegate* window_delegate) {
WindowGtk* window = new WindowGtk(window_delegate);
window->GetNonClientView()->SetFrameView(window->CreateFrameViewForWindow());
- window->Init(parent, bounds);
+ window->InitWindow(parent, bounds);
return window;
}
@@ -397,7 +397,7 @@ WindowGtk::WindowGtk(WindowDelegate* window_delegate)
window_delegate_->window_ = this;
}
-void WindowGtk::Init(GtkWindow* parent, const gfx::Rect& bounds) {
+void WindowGtk::InitWindow(GtkWindow* parent, const gfx::Rect& bounds) {
if (parent)
make_transient_to_parent();
WidgetGtk::Init(GTK_WIDGET(parent), bounds);
diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h
index 9f1af0d..de84986 100644
--- a/views/window/window_gtk.h
+++ b/views/window/window_gtk.h
@@ -82,7 +82,7 @@ class WindowGtk : public WidgetGtk, public Window {
explicit WindowGtk(WindowDelegate* window_delegate);
// Initializes the window to the passed in bounds.
- virtual void Init(GtkWindow* parent, const gfx::Rect& bounds);
+ virtual void InitWindow(GtkWindow* parent, const gfx::Rect& bounds);
virtual void OnDestroy(GtkWidget* widget);