| 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" |  | 
|  14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |  13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 
|  15 #include "chrome/browser/ui/views/frame/browser_view.h" |  14 #include "chrome/browser/ui/views/frame/browser_view.h" | 
|  16 #include "ui/base/hit_test.h" |  15 #include "ui/base/hit_test.h" | 
|  17 #include "ui/gfx/font.h" |  16 #include "ui/gfx/font.h" | 
|  18 #include "views/views_delegate.h" |  17 #include "views/views_delegate.h" | 
|  19 #include "views/widget/root_view.h" |  18 #include "views/widget/root_view.h" | 
|  20 #include "views/widget/widget.h" |  19 #include "views/widget/widget.h" | 
|  21  |  20  | 
|  22 // static |  21 // static | 
|  23 const gfx::Font& BrowserFrame::GetTitleFont() { |  22 const gfx::Font& BrowserFrame::GetTitleFont() { | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  83 } |  82 } | 
|  84  |  83  | 
|  85  |  84  | 
|  86 //////////////////////////////////////////////////////////////////////////////// |  85 //////////////////////////////////////////////////////////////////////////////// | 
|  87 // NativeBrowserFrame, public: |  86 // NativeBrowserFrame, public: | 
|  88  |  87  | 
|  89 // static |  88 // static | 
|  90 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |  89 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 
|  91     BrowserFrame* browser_frame, |  90     BrowserFrame* browser_frame, | 
|  92     BrowserView* browser_view) { |  91     BrowserView* browser_view) { | 
|  93   if (views::Widget::IsPureViews() && |  | 
|  94       views::ViewsDelegate::views_delegate->GetDefaultParentView()) |  | 
|  95     return new BrowserFrameViews(browser_frame, browser_view); |  | 
|  96   return new BrowserFrameGtk(browser_frame, browser_view); |  92   return new BrowserFrameGtk(browser_frame, browser_view); | 
|  97 } |  93 } | 
| OLD | NEW |