| OLD | NEW |
| 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/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
| 10 #include "chrome/browser/themes/theme_service_factory.h" | 10 #include "chrome/browser/themes/theme_service_factory.h" |
| 11 #include "chrome/browser/ui/status_bubble.h" | 11 #include "chrome/browser/ui/status_bubble.h" |
| 12 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" | 12 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" |
| 13 #include "chrome/browser/ui/views/frame/browser_frame_views.h" | 13 #include "chrome/browser/ui/views/frame/browser_frame_views.h" |
| 14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
| 15 #include "chrome/browser/ui/views/frame/browser_view.h" | 15 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 16 #include "ui/gfx/font.h" | 16 #include "ui/gfx/font.h" |
| 17 #include "views/views_delegate.h" |
| 17 #include "views/widget/root_view.h" | 18 #include "views/widget/root_view.h" |
| 18 #include "views/widget/widget.h" | 19 #include "views/widget/widget.h" |
| 19 #include "views/window/hit_test.h" | 20 #include "views/window/hit_test.h" |
| 20 | 21 |
| 21 // static | 22 // static |
| 22 const gfx::Font& BrowserFrame::GetTitleFont() { | 23 const gfx::Font& BrowserFrame::GetTitleFont() { |
| 23 static gfx::Font *title_font = new gfx::Font(); | 24 static gfx::Font *title_font = new gfx::Font(); |
| 24 return *title_font; | 25 return *title_font; |
| 25 } | 26 } |
| 26 | 27 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 85 } |
| 85 | 86 |
| 86 | 87 |
| 87 //////////////////////////////////////////////////////////////////////////////// | 88 //////////////////////////////////////////////////////////////////////////////// |
| 88 // NativeBrowserFrame, public: | 89 // NativeBrowserFrame, public: |
| 89 | 90 |
| 90 // static | 91 // static |
| 91 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 92 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
| 92 BrowserFrame* browser_frame, | 93 BrowserFrame* browser_frame, |
| 93 BrowserView* browser_view) { | 94 BrowserView* browser_view) { |
| 94 if (views::Widget::IsPureViews()) | 95 if (views::Widget::IsPureViews() && |
| 96 views::ViewsDelegate::views_delegate->GetDefaultParentView()) |
| 95 return new BrowserFrameViews(browser_frame, browser_view); | 97 return new BrowserFrameViews(browser_frame, browser_view); |
| 96 return new BrowserFrameGtk(browser_frame, browser_view); | 98 return new BrowserFrameGtk(browser_frame, browser_view); |
| 97 } | 99 } |
| 98 | 100 |
| OLD | NEW |