Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_gtk.cc

Issue 6624027: Rename BrowserFrameGtk::Init to BFG::InitBrowserFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/frame/browser_frame_gtk.h" 5 #include "chrome/browser/ui/views/frame/browser_frame_gtk.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/themes/browser_theme_provider.h" 9 #include "chrome/browser/themes/browser_theme_provider.h"
10 #include "chrome/browser/ui/status_bubble.h" 10 #include "chrome/browser/ui/status_bubble.h"
11 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" 11 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h"
12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
13 #include "chrome/browser/ui/views/frame/browser_root_view.h" 13 #include "chrome/browser/ui/views/frame/browser_root_view.h"
14 #include "chrome/browser/ui/views/frame/browser_view.h" 14 #include "chrome/browser/ui/views/frame/browser_view.h"
15 #include "ui/gfx/font.h" 15 #include "ui/gfx/font.h"
16 #include "views/widget/root_view.h" 16 #include "views/widget/root_view.h"
17 #include "views/window/hit_test.h" 17 #include "views/window/hit_test.h"
18 18
19 #if !defined(OS_CHROMEOS) 19 #if !defined(OS_CHROMEOS)
20 // static (Factory method.) 20 // static (Factory method.)
21 BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, 21 BrowserFrame* BrowserFrame::Create(BrowserView* browser_view,
22 Profile* profile) { 22 Profile* profile) {
23 BrowserFrameGtk* frame = new BrowserFrameGtk(browser_view, profile); 23 BrowserFrameGtk* frame = new BrowserFrameGtk(browser_view, profile);
24 frame->Init(); 24 frame->InitBrowserFrame();
25 return frame; 25 return frame;
26 } 26 }
27 #endif 27 #endif
28 28
29 // static 29 // static
30 const gfx::Font& BrowserFrame::GetTitleFont() { 30 const gfx::Font& BrowserFrame::GetTitleFont() {
31 static gfx::Font *title_font = new gfx::Font(); 31 static gfx::Font *title_font = new gfx::Font();
32 return *title_font; 32 return *title_font;
33 } 33 }
34 34
35 BrowserFrameGtk::BrowserFrameGtk(BrowserView* browser_view, Profile* profile) 35 BrowserFrameGtk::BrowserFrameGtk(BrowserView* browser_view, Profile* profile)
36 : WindowGtk(browser_view), 36 : WindowGtk(browser_view),
37 browser_view_(browser_view), 37 browser_view_(browser_view),
38 browser_frame_view_(NULL), 38 browser_frame_view_(NULL),
39 root_view_(NULL), 39 root_view_(NULL),
40 profile_(profile) { 40 profile_(profile) {
41 browser_view_->set_frame(this); 41 browser_view_->set_frame(this);
42 } 42 }
43 43
44 BrowserFrameGtk::~BrowserFrameGtk() { 44 BrowserFrameGtk::~BrowserFrameGtk() {
45 } 45 }
46 46
47 void BrowserFrameGtk::Init() { 47 void BrowserFrameGtk::InitBrowserFrame() {
48 if (browser_frame_view_ == NULL) 48 if (browser_frame_view_ == NULL)
49 browser_frame_view_ = 49 browser_frame_view_ =
50 browser::CreateBrowserNonClientFrameView(this, browser_view_); 50 browser::CreateBrowserNonClientFrameView(this, browser_view_);
51 51
52 GetNonClientView()->SetFrameView(browser_frame_view_); 52 GetNonClientView()->SetFrameView(browser_frame_view_);
53 WindowGtk::InitWindow(NULL, gfx::Rect()); 53 WindowGtk::InitWindow(NULL, gfx::Rect());
54 // Don't focus anything on creation, selecting a tab will set the focus. 54 // Don't focus anything on creation, selecting a tab will set the focus.
55 } 55 }
56 56
57 views::Window* BrowserFrameGtk::GetWindow() { 57 views::Window* BrowserFrameGtk::GetWindow() {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 if (was_full_screen != IsFullscreen()) 134 if (was_full_screen != IsFullscreen())
135 browser_view_->FullScreenStateChanged(); 135 browser_view_->FullScreenStateChanged();
136 return result; 136 return result;
137 } 137 }
138 138
139 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, 139 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget,
140 GdkEventConfigure* event) { 140 GdkEventConfigure* event) {
141 browser_view_->WindowMoved(); 141 browser_view_->WindowMoved();
142 return views::WindowGtk::OnConfigureEvent(widget, event); 142 return views::WindowGtk::OnConfigureEvent(widget, event);
143 } 143 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_gtk.h ('k') | chrome/browser/ui/views/frame/browser_frame_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698