| Index: chrome/browser/chromeos/frame/browser_frame_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
|
| index 61d1d979bf158f0d8c4222bece30931b3781b8b3..74d1cc8d7869663d22a7c082f620ce1edb14b9d9 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.
|
|
|