diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 21:01:10 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 21:01:10 +0000 |
commit | 5bd8d1716b3f27664348c7fcb2c33f2e3a4573a7 (patch) | |
tree | b36ce5138052cff18446b38ca481d751d4c73edc /chrome/browser/ui/views | |
parent | 12505041162dbd4d81da22c5b3fc145ff2cb3b11 (diff) | |
download | chromium_src-5bd8d1716b3f27664348c7fcb2c33f2e3a4573a7.zip chromium_src-5bd8d1716b3f27664348c7fcb2c33f2e3a4573a7.tar.gz chromium_src-5bd8d1716b3f27664348c7fcb2c33f2e3a4573a7.tar.bz2 |
Rename BrowserFrameGtk::Init to BFG::InitBrowserFrame.
This makes it clear it's not an intended override of WidgetGtk::Init.
BUG=70465,72205
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/6624027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views')
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index 904bff5..ef8b1d4 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -21,7 +21,7 @@ BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, Profile* profile) { BrowserFrameGtk* frame = new BrowserFrameGtk(browser_view, profile); - frame->Init(); + frame->InitBrowserFrame(); return frame; } #endif @@ -44,7 +44,7 @@ BrowserFrameGtk::BrowserFrameGtk(BrowserView* browser_view, Profile* profile) BrowserFrameGtk::~BrowserFrameGtk() { } -void BrowserFrameGtk::Init() { +void BrowserFrameGtk::InitBrowserFrame() { if (browser_frame_view_ == NULL) browser_frame_view_ = browser::CreateBrowserNonClientFrameView(this, browser_view_); diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.h b/chrome/browser/ui/views/frame/browser_frame_gtk.h index 95e5b6b..109a6a0 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.h +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.h @@ -25,7 +25,7 @@ class BrowserFrameGtk : public BrowserFrame, // initialization function must be called after construction, it is // separate to avoid recursive calling of the frame from its // constructor. - virtual void Init(); + virtual void InitBrowserFrame(); // Overridden from BrowserFrame: virtual views::Window* GetWindow(); diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index a63d652..9638f10 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -35,7 +35,7 @@ static const int kDWMFrameTopOffset = 3; BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, Profile* profile) { BrowserFrameWin* frame = new BrowserFrameWin(browser_view, profile); - frame->Init(); + frame->InitBrowserFrame(); return frame; } @@ -61,7 +61,7 @@ BrowserFrameWin::BrowserFrameWin(BrowserView* browser_view, Profile* profile) set_focus_on_creation(false); } -void BrowserFrameWin::Init() { +void BrowserFrameWin::InitBrowserFrame() { WindowWin::Init(NULL, gfx::Rect()); } diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index 835ff3f..0d5e29b 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -32,7 +32,7 @@ class BrowserFrameWin : public BrowserFrame, public views::WindowWin { // This initialization function must be called after construction, it is // separate to avoid recursive calling of the frame from its constructor. - void Init(); + void InitBrowserFrame(); BrowserView* browser_view() const { return browser_view_; } |