| 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 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1930 return kViewClassName; | 1930 return kViewClassName; |
| 1931 } | 1931 } |
| 1932 | 1932 |
| 1933 void BrowserView::Layout() { | 1933 void BrowserView::Layout() { |
| 1934 if (!initialized_ || in_process_fullscreen_) | 1934 if (!initialized_ || in_process_fullscreen_) |
| 1935 return; | 1935 return; |
| 1936 | 1936 |
| 1937 views::View::Layout(); | 1937 views::View::Layout(); |
| 1938 | 1938 |
| 1939 // TODO(jamescook): Why was this in the middle of layout code? | 1939 // TODO(jamescook): Why was this in the middle of layout code? |
| 1940 toolbar_->location_bar()->omnibox_view()->SetFocusable(IsToolbarVisible()); | 1940 toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( |
| 1941 IsToolbarVisible() ? FocusBehavior::ALWAYS : FocusBehavior::NEVER); |
| 1941 } | 1942 } |
| 1942 | 1943 |
| 1943 void BrowserView::ViewHierarchyChanged( | 1944 void BrowserView::ViewHierarchyChanged( |
| 1944 const ViewHierarchyChangedDetails& details) { | 1945 const ViewHierarchyChangedDetails& details) { |
| 1945 if (!initialized_ && details.is_add && details.child == this && GetWidget()) { | 1946 if (!initialized_ && details.is_add && details.child == this && GetWidget()) { |
| 1946 InitViews(); | 1947 InitViews(); |
| 1947 initialized_ = true; | 1948 initialized_ = true; |
| 1948 } | 1949 } |
| 1949 } | 1950 } |
| 1950 | 1951 |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2655 } | 2656 } |
| 2656 | 2657 |
| 2657 extensions::ActiveTabPermissionGranter* | 2658 extensions::ActiveTabPermissionGranter* |
| 2658 BrowserView::GetActiveTabPermissionGranter() { | 2659 BrowserView::GetActiveTabPermissionGranter() { |
| 2659 content::WebContents* web_contents = GetActiveWebContents(); | 2660 content::WebContents* web_contents = GetActiveWebContents(); |
| 2660 if (!web_contents) | 2661 if (!web_contents) |
| 2661 return nullptr; | 2662 return nullptr; |
| 2662 return extensions::TabHelper::FromWebContents(web_contents) | 2663 return extensions::TabHelper::FromWebContents(web_contents) |
| 2663 ->active_tab_permission_granter(); | 2664 ->active_tab_permission_granter(); |
| 2664 } | 2665 } |
| OLD | NEW |