| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/frame/browser_frame_gtk.h" | 5 #include "chrome/browser/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_root_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_root_view.h" |
| 13 #include "chrome/browser/ui/views/frame/browser_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" | |
| 15 #include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" | |
| 16 #include "gfx/font.h" | 15 #include "gfx/font.h" |
| 17 #include "views/widget/root_view.h" | 16 #include "views/widget/root_view.h" |
| 18 #include "views/window/hit_test.h" | 17 #include "views/window/hit_test.h" |
| 19 | 18 |
| 20 #if !defined(OS_CHROMEOS) | 19 #if !defined(OS_CHROMEOS) |
| 21 // static (Factory method.) | 20 // static (Factory method.) |
| 22 BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, | 21 BrowserFrame* BrowserFrame::Create(BrowserView* browser_view, |
| 23 Profile* profile) { | 22 Profile* profile) { |
| 24 BrowserFrameGtk* frame = new BrowserFrameGtk(browser_view, profile); | 23 BrowserFrameGtk* frame = new BrowserFrameGtk(browser_view, profile); |
| 25 frame->Init(); | 24 frame->Init(); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 39 browser_frame_view_(NULL), | 38 browser_frame_view_(NULL), |
| 40 root_view_(NULL), | 39 root_view_(NULL), |
| 41 profile_(profile) { | 40 profile_(profile) { |
| 42 browser_view_->set_frame(this); | 41 browser_view_->set_frame(this); |
| 43 } | 42 } |
| 44 | 43 |
| 45 BrowserFrameGtk::~BrowserFrameGtk() { | 44 BrowserFrameGtk::~BrowserFrameGtk() { |
| 46 } | 45 } |
| 47 | 46 |
| 48 void BrowserFrameGtk::Init() { | 47 void BrowserFrameGtk::Init() { |
| 49 if (browser_frame_view_ == NULL) { | 48 if (browser_frame_view_ == NULL) |
| 50 if (browser_view_->browser()->type() & Browser::TYPE_POPUP) | 49 browser_frame_view_ = |
| 51 browser_frame_view_ = new PopupNonClientFrameView(); | 50 browser::CreateBrowserNonClientFrameView(this, browser_view_); |
| 52 else | 51 |
| 53 browser_frame_view_ = new OpaqueBrowserFrameView(this, browser_view_); | |
| 54 } | |
| 55 GetNonClientView()->SetFrameView(browser_frame_view_); | 52 GetNonClientView()->SetFrameView(browser_frame_view_); |
| 56 WindowGtk::Init(NULL, gfx::Rect()); | 53 WindowGtk::Init(NULL, gfx::Rect()); |
| 57 // 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. |
| 58 } | 55 } |
| 59 | 56 |
| 60 views::Window* BrowserFrameGtk::GetWindow() { | 57 views::Window* BrowserFrameGtk::GetWindow() { |
| 61 return this; | 58 return this; |
| 62 } | 59 } |
| 63 | 60 |
| 64 int BrowserFrameGtk::GetMinimizeButtonOffset() const { | 61 int BrowserFrameGtk::GetMinimizeButtonOffset() const { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if (was_full_screen != IsFullscreen()) | 138 if (was_full_screen != IsFullscreen()) |
| 142 browser_view_->FullScreenStateChanged(); | 139 browser_view_->FullScreenStateChanged(); |
| 143 return result; | 140 return result; |
| 144 } | 141 } |
| 145 | 142 |
| 146 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, | 143 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget, |
| 147 GdkEventConfigure* event) { | 144 GdkEventConfigure* event) { |
| 148 browser_view_->WindowMoved(); | 145 browser_view_->WindowMoved(); |
| 149 return views::WindowGtk::OnConfigureEvent(widget, event); | 146 return views::WindowGtk::OnConfigureEvent(widget, event); |
| 150 } | 147 } |
| OLD | NEW |