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 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1980 switches::kEnableExperimentalFullscreenExitUI)) { | 1980 switches::kEnableExperimentalFullscreenExitUI)) { |
1981 widget->GetNativeView()->AddPreTargetHandler(GetFullscreenControlHost()); | 1981 widget->GetNativeView()->AddPreTargetHandler(GetFullscreenControlHost()); |
1982 } | 1982 } |
1983 } else if (fullscreen_control_host_) { | 1983 } else if (fullscreen_control_host_) { |
1984 auto* native_view = widget->GetNativeView(); | 1984 auto* native_view = widget->GetNativeView(); |
1985 if (native_view) | 1985 if (native_view) |
1986 native_view->RemovePreTargetHandler(fullscreen_control_host_.get()); | 1986 native_view->RemovePreTargetHandler(fullscreen_control_host_.get()); |
1987 } | 1987 } |
1988 } | 1988 } |
1989 | 1989 |
1990 void BrowserView::PaintChildren(const ui::PaintContext& context) { | 1990 void BrowserView::PaintChildren(const ui::PaintInfo& paint_info) { |
1991 views::ClientView::PaintChildren(context); | 1991 views::ClientView::PaintChildren(paint_info); |
1992 // Don't reset the instance before it had a chance to get compositor callback. | 1992 // Don't reset the instance before it had a chance to get compositor callback. |
1993 if (!histogram_helper_) { | 1993 if (!histogram_helper_) { |
1994 histogram_helper_ = BrowserWindowHistogramHelper:: | 1994 histogram_helper_ = BrowserWindowHistogramHelper:: |
1995 MaybeRecordValueAndCreateInstanceOnBrowserPaint( | 1995 MaybeRecordValueAndCreateInstanceOnBrowserPaint( |
1996 GetWidget()->GetCompositor()); | 1996 GetWidget()->GetCompositor()); |
1997 } | 1997 } |
1998 } | 1998 } |
1999 | 1999 |
2000 void BrowserView::ChildPreferredSizeChanged(View* child) { | 2000 void BrowserView::ChildPreferredSizeChanged(View* child) { |
2001 Layout(); | 2001 Layout(); |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2689 } | 2689 } |
2690 | 2690 |
2691 extensions::ActiveTabPermissionGranter* | 2691 extensions::ActiveTabPermissionGranter* |
2692 BrowserView::GetActiveTabPermissionGranter() { | 2692 BrowserView::GetActiveTabPermissionGranter() { |
2693 content::WebContents* web_contents = GetActiveWebContents(); | 2693 content::WebContents* web_contents = GetActiveWebContents(); |
2694 if (!web_contents) | 2694 if (!web_contents) |
2695 return nullptr; | 2695 return nullptr; |
2696 return extensions::TabHelper::FromWebContents(web_contents) | 2696 return extensions::TabHelper::FromWebContents(web_contents) |
2697 ->active_tab_permission_granter(); | 2697 ->active_tab_permission_granter(); |
2698 } | 2698 } |
OLD | NEW |