diff options
Diffstat (limited to 'chrome/browser')
6 files changed, 10 insertions, 10 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; 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_; } |