| 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" |
| 11 #include "chrome/browser/themes/theme_service.h" | 11 #include "chrome/browser/themes/theme_service.h" |
| 12 #include "chrome/browser/themes/theme_service_factory.h" | 12 #include "chrome/browser/themes/theme_service_factory.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_list.h" | 14 #include "chrome/browser/ui/browser_list.h" |
| 15 #include "chrome/browser/ui/browser_window_state.h" | 15 #include "chrome/browser/ui/browser_window_state.h" |
| 16 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
| 17 #include "chrome/browser/ui/views/frame/browser_root_view.h" | 17 #include "chrome/browser/ui/views/frame/browser_root_view.h" |
| 18 #include "chrome/browser/ui/views/frame/browser_view.h" | 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 19 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 19 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 20 #include "chrome/browser/ui/views/frame/native_browser_frame.h" | 20 #include "chrome/browser/ui/views/frame/native_browser_frame.h" |
| 21 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" |
| 21 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h" | 22 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h" |
| 22 #include "chrome/browser/ui/views/frame/top_container_view.h" | 23 #include "chrome/browser/ui/views/frame/top_container_view.h" |
| 23 #include "chrome/browser/web_applications/web_app.h" | 24 #include "chrome/browser/web_applications/web_app.h" |
| 24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
| 25 #include "ui/aura/root_window.h" | 26 #include "ui/aura/root_window.h" |
| 26 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
| 27 #include "ui/base/hit_test.h" | 28 #include "ui/base/hit_test.h" |
| 28 #include "ui/base/theme_provider.h" | 29 #include "ui/base/theme_provider.h" |
| 29 #include "ui/gfx/screen.h" | 30 #include "ui/gfx/screen.h" |
| 30 #include "ui/views/controls/menu/menu_runner.h" | 31 #include "ui/views/controls/menu/menu_runner.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 56 set_is_secondary_widget(false); | 57 set_is_secondary_widget(false); |
| 57 // Don't focus anything on creation, selecting a tab will set the focus. | 58 // Don't focus anything on creation, selecting a tab will set the focus. |
| 58 set_focus_on_creation(false); | 59 set_focus_on_creation(false); |
| 59 } | 60 } |
| 60 | 61 |
| 61 BrowserFrame::~BrowserFrame() { | 62 BrowserFrame::~BrowserFrame() { |
| 62 } | 63 } |
| 63 | 64 |
| 64 void BrowserFrame::InitBrowserFrame() { | 65 void BrowserFrame::InitBrowserFrame() { |
| 65 native_browser_frame_ = | 66 native_browser_frame_ = |
| 66 NativeBrowserFrame::CreateNativeBrowserFrame(this, browser_view_); | 67 NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); |
| 67 views::Widget::InitParams params; | 68 views::Widget::InitParams params; |
| 68 params.delegate = browser_view_; | 69 params.delegate = browser_view_; |
| 69 params.native_widget = native_browser_frame_->AsNativeWidget(); | 70 params.native_widget = native_browser_frame_->AsNativeWidget(); |
| 70 if (browser_view_->browser()->is_type_tabbed()) { | 71 if (browser_view_->browser()->is_type_tabbed()) { |
| 71 // Typed panel/popup can only return a size once the widget has been | 72 // Typed panel/popup can only return a size once the widget has been |
| 72 // created. | 73 // created. |
| 73 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), | 74 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), |
| 74 ¶ms.bounds, | 75 ¶ms.bounds, |
| 75 ¶ms.show_state); | 76 ¶ms.show_state); |
| 76 } | 77 } |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 237 |
| 237 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 238 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 238 return browser_frame_view_->avatar_button(); | 239 return browser_frame_view_->avatar_button(); |
| 239 } | 240 } |
| 240 | 241 |
| 241 #if !defined(OS_WIN) || defined(USE_AURA) | 242 #if !defined(OS_WIN) || defined(USE_AURA) |
| 242 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 243 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
| 243 return !IsMaximized(); | 244 return !IsMaximized(); |
| 244 } | 245 } |
| 245 #endif // OS_WIN | 246 #endif // OS_WIN |
| OLD | NEW |