OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <memory> | 10 #include <memory> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "chrome/browser/ui/views/accelerator_table.h" | 59 #include "chrome/browser/ui/views/accelerator_table.h" |
60 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" | 60 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" |
61 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 61 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
62 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" | 62 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" |
63 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 63 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
64 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 64 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
65 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 65 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
66 #include "chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.h" | 66 #include "chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.h" |
67 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 67 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
68 #include "chrome/browser/ui/views/find_bar_host.h" | 68 #include "chrome/browser/ui/views/find_bar_host.h" |
| 69 #include "chrome/browser/ui/views/frame/browser_view_histogram_helper.h" |
69 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 70 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
70 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 71 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
71 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 72 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
72 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 73 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
73 #include "chrome/browser/ui/views/frame/top_container_view.h" | 74 #include "chrome/browser/ui/views/frame/top_container_view.h" |
74 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 75 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
75 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" | 76 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" |
76 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 77 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
77 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 78 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
78 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 79 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 toolbar_(nullptr), | 411 toolbar_(nullptr), |
411 find_bar_host_view_(nullptr), | 412 find_bar_host_view_(nullptr), |
412 infobar_container_(nullptr), | 413 infobar_container_(nullptr), |
413 contents_web_view_(nullptr), | 414 contents_web_view_(nullptr), |
414 devtools_web_view_(nullptr), | 415 devtools_web_view_(nullptr), |
415 contents_container_(nullptr), | 416 contents_container_(nullptr), |
416 initialized_(false), | 417 initialized_(false), |
417 handling_theme_changed_(false), | 418 handling_theme_changed_(false), |
418 in_process_fullscreen_(false), | 419 in_process_fullscreen_(false), |
419 force_location_bar_focus_(false), | 420 force_location_bar_focus_(false), |
420 activate_modal_dialog_factory_(this) { | 421 histogram_helper_(base::MakeUnique<BrowserViewHistogramHelper>()), |
421 } | 422 activate_modal_dialog_factory_(this) {} |
422 | 423 |
423 BrowserView::~BrowserView() { | 424 BrowserView::~BrowserView() { |
424 // All the tabs should have been destroyed already. If we were closed by the | 425 // All the tabs should have been destroyed already. If we were closed by the |
425 // OS with some tabs than the NativeBrowserFrame should have destroyed them. | 426 // OS with some tabs than the NativeBrowserFrame should have destroyed them. |
426 DCHECK_EQ(0, browser_->tab_strip_model()->count()); | 427 DCHECK_EQ(0, browser_->tab_strip_model()->count()); |
427 | 428 |
428 // Stop the animation timer explicitly here to avoid running it in a nested | 429 // Stop the animation timer explicitly here to avoid running it in a nested |
429 // message loop, which may run by Browser destructor. | 430 // message loop, which may run by Browser destructor. |
430 loading_animation_timer_.Stop(); | 431 loading_animation_timer_.Stop(); |
431 | 432 |
(...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1976 } | 1977 } |
1977 | 1978 |
1978 void BrowserView::ViewHierarchyChanged( | 1979 void BrowserView::ViewHierarchyChanged( |
1979 const ViewHierarchyChangedDetails& details) { | 1980 const ViewHierarchyChangedDetails& details) { |
1980 if (!initialized_ && details.is_add && details.child == this && GetWidget()) { | 1981 if (!initialized_ && details.is_add && details.child == this && GetWidget()) { |
1981 InitViews(); | 1982 InitViews(); |
1982 initialized_ = true; | 1983 initialized_ = true; |
1983 } | 1984 } |
1984 } | 1985 } |
1985 | 1986 |
| 1987 void BrowserView::PaintChildren(const ui::PaintContext& context) { |
| 1988 views::ClientView::PaintChildren(context); |
| 1989 histogram_helper_->OnDidPaintChildren(GetWidget()->GetCompositor()); |
| 1990 } |
| 1991 |
1986 void BrowserView::ChildPreferredSizeChanged(View* child) { | 1992 void BrowserView::ChildPreferredSizeChanged(View* child) { |
1987 Layout(); | 1993 Layout(); |
1988 } | 1994 } |
1989 | 1995 |
1990 void BrowserView::GetAccessibleNodeData(ui::AXNodeData* node_data) { | 1996 void BrowserView::GetAccessibleNodeData(ui::AXNodeData* node_data) { |
1991 node_data->role = ui::AX_ROLE_CLIENT; | 1997 node_data->role = ui::AX_ROLE_CLIENT; |
1992 } | 1998 } |
1993 | 1999 |
1994 void BrowserView::OnThemeChanged() { | 2000 void BrowserView::OnThemeChanged() { |
1995 if (!IsRegularOrGuestSession()) { | 2001 if (!IsRegularOrGuestSession()) { |
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2672 } | 2678 } |
2673 | 2679 |
2674 extensions::ActiveTabPermissionGranter* | 2680 extensions::ActiveTabPermissionGranter* |
2675 BrowserView::GetActiveTabPermissionGranter() { | 2681 BrowserView::GetActiveTabPermissionGranter() { |
2676 content::WebContents* web_contents = GetActiveWebContents(); | 2682 content::WebContents* web_contents = GetActiveWebContents(); |
2677 if (!web_contents) | 2683 if (!web_contents) |
2678 return nullptr; | 2684 return nullptr; |
2679 return extensions::TabHelper::FromWebContents(web_contents) | 2685 return extensions::TabHelper::FromWebContents(web_contents) |
2680 ->active_tab_permission_granter(); | 2686 ->active_tab_permission_granter(); |
2681 } | 2687 } |
OLD | NEW |