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/chromeos/frame | |
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/chromeos/frame')
-rw-r--r-- | chrome/browser/chromeos/frame/browser_frame_chromeos.cc | 6 | ||||
-rw-r--r-- | chrome/browser/chromeos/frame/browser_frame_chromeos.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc index 61d1d97..74d1cc8 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc @@ -14,7 +14,7 @@ BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, Profile* profile) { chromeos::BrowserFrameChromeos* frame = new chromeos::BrowserFrameChromeos(browser_view, profile); - frame->Init(); + frame->InitBrowserFrame(); return frame; } @@ -28,13 +28,13 @@ BrowserFrameChromeos::BrowserFrameChromeos( BrowserFrameChromeos::~BrowserFrameChromeos() { } -void BrowserFrameChromeos::Init() { +void BrowserFrameChromeos::InitBrowserFrame() { // NOTE: This logic supersedes the logic in BrowserFrameGtk::Init() // by always setting browser_frame_view_. set_browser_frame_view( browser::CreateBrowserNonClientFrameView(this, browser_view())); - BrowserFrameGtk::Init(); + BrowserFrameGtk::InitBrowserFrame(); if (!browser_view()->IsBrowserTypePopup()) { // On chromeos we want windows to always render as active. diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.h b/chrome/browser/chromeos/frame/browser_frame_chromeos.h index b1fe5e4..abfbef4 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.h +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.h @@ -16,7 +16,7 @@ class BrowserFrameChromeos : public BrowserFrameGtk { virtual ~BrowserFrameChromeos(); // BrowserFrameGtk overrides. - virtual void Init(); + virtual void InitBrowserFrame(); // views::WindowGtk overrides. virtual bool IsMaximized() const; |