| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "ui/aura/root_window.h" | 26 #include "ui/aura/root_window.h" |
| 27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
| 28 #include "ui/base/hit_test.h" | 28 #include "ui/base/hit_test.h" |
| 29 #include "ui/base/theme_provider.h" | 29 #include "ui/base/theme_provider.h" |
| 30 #include "ui/gfx/screen.h" | 30 #include "ui/gfx/screen.h" |
| 31 #include "ui/views/controls/menu/menu_runner.h" | 31 #include "ui/views/controls/menu/menu_runner.h" |
| 32 #include "ui/views/widget/native_widget.h" | 32 #include "ui/views/widget/native_widget.h" |
| 33 | 33 |
| 34 #if defined(OS_WIN) && !defined(USE_AURA) | 34 #if defined(OS_WIN) && !defined(USE_AURA) |
| 35 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" | 35 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
| 36 #include "ui/views/widget/native_widget_win.cc" |
| 36 #endif | 37 #endif |
| 37 | 38 |
| 38 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 39 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 39 #include "chrome/browser/shell_integration_linux.h" | 40 #include "chrome/browser/shell_integration_linux.h" |
| 40 #endif | 41 #endif |
| 41 | 42 |
| 42 #if defined(USE_ASH) | 43 #if defined(USE_ASH) |
| 43 #include "chrome/browser/ui/ash/ash_init.h" | 44 #include "chrome/browser/ui/ash/ash_init.h" |
| 44 #endif | 45 #endif |
| 45 | 46 |
| 46 //////////////////////////////////////////////////////////////////////////////// | 47 //////////////////////////////////////////////////////////////////////////////// |
| 47 // BrowserFrame, public: | 48 // BrowserFrame, public: |
| 48 | 49 |
| 49 BrowserFrame::BrowserFrame(BrowserView* browser_view) | 50 BrowserFrame::BrowserFrame(BrowserView* browser_view) |
| 50 : native_browser_frame_(NULL), | 51 : native_browser_frame_(NULL), |
| 51 root_view_(NULL), | 52 root_view_(NULL), |
| 52 browser_frame_view_(NULL), | 53 browser_frame_view_(NULL), |
| 53 browser_view_(browser_view), | 54 browser_view_(browser_view), |
| 54 theme_provider_(ThemeServiceFactory::GetForProfile( | 55 theme_provider_(ThemeServiceFactory::GetForProfile( |
| 55 browser_view_->browser()->profile())) { | 56 browser_view_->browser()->profile())) { |
| 56 browser_view_->set_frame(this); | 57 browser_view_->set_frame(this); |
| 57 set_is_secondary_widget(false); | 58 set_is_secondary_widget(false); |
| 58 // Don't focus anything on creation, selecting a tab will set the focus. | 59 // Don't focus anything on creation, selecting a tab will set the focus. |
| 59 set_focus_on_creation(false); | 60 set_focus_on_creation(false); |
| 60 } | 61 } |
| 61 | 62 |
| 62 BrowserFrame::~BrowserFrame() { | 63 BrowserFrame::~BrowserFrame() { |
| 63 } | 64 } |
| 64 | 65 |
| 66 // static |
| 67 const gfx::Font& BrowserFrame::GetTitleFont() { |
| 68 #if !defined(OS_WIN) || defined(USE_AURA) |
| 69 static gfx::Font* title_font = new gfx::Font; |
| 70 #else |
| 71 static gfx::Font* title_font = |
| 72 new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont()); |
| 73 #endif |
| 74 return *title_font; |
| 75 } |
| 76 |
| 65 void BrowserFrame::InitBrowserFrame() { | 77 void BrowserFrame::InitBrowserFrame() { |
| 66 native_browser_frame_ = | 78 native_browser_frame_ = |
| 67 NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); | 79 NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); |
| 68 views::Widget::InitParams params; | 80 views::Widget::InitParams params; |
| 69 params.delegate = browser_view_; | 81 params.delegate = browser_view_; |
| 70 params.native_widget = native_browser_frame_->AsNativeWidget(); | 82 params.native_widget = native_browser_frame_->AsNativeWidget(); |
| 71 if (browser_view_->browser()->is_type_tabbed()) { | 83 if (browser_view_->browser()->is_type_tabbed()) { |
| 72 // Typed panel/popup can only return a size once the widget has been | 84 // Typed panel/popup can only return a size once the widget has been |
| 73 // created. | 85 // created. |
| 74 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), | 86 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 | 249 |
| 238 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 250 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 239 return browser_frame_view_->avatar_button(); | 251 return browser_frame_view_->avatar_button(); |
| 240 } | 252 } |
| 241 | 253 |
| 242 #if !defined(OS_WIN) || defined(USE_AURA) | 254 #if !defined(OS_WIN) || defined(USE_AURA) |
| 243 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 255 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
| 244 return !IsMaximized(); | 256 return !IsMaximized(); |
| 245 } | 257 } |
| 246 #endif // OS_WIN | 258 #endif // OS_WIN |
| OLD | NEW |