Chromium Code Reviews| 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 "base/debug/leak_annotations.h" | 7 #include "base/debug/leak_annotations.h" |
| 8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
| 9 #include "chrome/browser/app_mode/app_mode_utils.h" | 9 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 static const gfx::FontList* title_font_list = new gfx::FontList(); | 61 static const gfx::FontList* title_font_list = new gfx::FontList(); |
| 62 ANNOTATE_LEAKING_OBJECT_PTR(title_font_list); | 62 ANNOTATE_LEAKING_OBJECT_PTR(title_font_list); |
| 63 return *title_font_list; | 63 return *title_font_list; |
| 64 } | 64 } |
| 65 | 65 |
| 66 void BrowserFrame::InitBrowserFrame() { | 66 void BrowserFrame::InitBrowserFrame() { |
| 67 native_browser_frame_ = | 67 native_browser_frame_ = |
| 68 NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); | 68 NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); |
| 69 views::Widget::InitParams params = native_browser_frame_->GetWidgetParams(); | 69 views::Widget::InitParams params = native_browser_frame_->GetWidgetParams(); |
| 70 params.delegate = browser_view_; | 70 params.delegate = browser_view_; |
| 71 if (browser_view_->browser()->is_override_redirect()) { | |
| 72 params.type = views::Widget::InitParams::TYPE_DRAG_BROWSER; | |
|
Daniel Erat
2015/11/18 16:16:47
it seems weird to infer this type based on the ove
stapelberg
2015/12/23 13:17:24
Well, given that TYPE_DRAG_BROWSER is exactly TYPE
| |
| 73 } | |
| 71 if (browser_view_->browser()->is_type_tabbed()) { | 74 if (browser_view_->browser()->is_type_tabbed()) { |
| 72 // Typed panel/popup can only return a size once the widget has been | 75 // Typed panel/popup can only return a size once the widget has been |
| 73 // created. | 76 // created. |
| 74 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), | 77 chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(), |
| 75 ¶ms.bounds, | 78 ¶ms.bounds, |
| 76 ¶ms.show_state); | 79 ¶ms.show_state); |
| 77 } | 80 } |
| 78 Init(params); | 81 Init(params); |
| 79 | 82 |
| 80 if (!native_browser_frame_->UsesNativeSystemMenu()) { | 83 if (!native_browser_frame_->UsesNativeSystemMenu()) { |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 243 | 246 |
| 244 #if defined(FRAME_AVATAR_BUTTON) | 247 #if defined(FRAME_AVATAR_BUTTON) |
| 245 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { | 248 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { |
| 246 return browser_frame_view_->new_avatar_button(); | 249 return browser_frame_view_->new_avatar_button(); |
| 247 } | 250 } |
| 248 #endif | 251 #endif |
| 249 | 252 |
| 250 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 253 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
| 251 return !IsMaximized(); | 254 return !IsMaximized(); |
| 252 } | 255 } |
| OLD | NEW |