| 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 2145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2156 browser_->tab_strip_model()->GetActiveWebContents(); | 2156 browser_->tab_strip_model()->GetActiveWebContents(); |
| 2157 // GetActiveWebContents can return null for example under Purify when | 2157 // GetActiveWebContents can return null for example under Purify when |
| 2158 // the animations are running slowly and this function is called on a timer | 2158 // the animations are running slowly and this function is called on a timer |
| 2159 // through LoadingAnimationCallback. | 2159 // through LoadingAnimationCallback. |
| 2160 frame_->UpdateThrobber(web_contents && web_contents->IsLoading()); | 2160 frame_->UpdateThrobber(web_contents && web_contents->IsLoading()); |
| 2161 } | 2161 } |
| 2162 } | 2162 } |
| 2163 | 2163 |
| 2164 void BrowserView::OnLoadCompleted() { | 2164 void BrowserView::OnLoadCompleted() { |
| 2165 #if defined(OS_WIN) | 2165 #if defined(OS_WIN) |
| 2166 DCHECK(!jumplist_.get()); | 2166 // Ensure that this browser's Profile has a JumpList so that the JumpList is |
| 2167 jumplist_ = JumpListFactory::GetForProfile(browser_->profile()); | 2167 // kept up to date. |
| 2168 JumpListFactory::GetForProfile(browser_->profile()); |
| 2168 #endif | 2169 #endif |
| 2169 } | 2170 } |
| 2170 | 2171 |
| 2171 BrowserViewLayout* BrowserView::GetBrowserViewLayout() const { | 2172 BrowserViewLayout* BrowserView::GetBrowserViewLayout() const { |
| 2172 return static_cast<BrowserViewLayout*>(GetLayoutManager()); | 2173 return static_cast<BrowserViewLayout*>(GetLayoutManager()); |
| 2173 } | 2174 } |
| 2174 | 2175 |
| 2175 ContentsLayoutManager* BrowserView::GetContentsLayoutManager() const { | 2176 ContentsLayoutManager* BrowserView::GetContentsLayoutManager() const { |
| 2176 return static_cast<ContentsLayoutManager*>( | 2177 return static_cast<ContentsLayoutManager*>( |
| 2177 contents_container_->GetLayoutManager()); | 2178 contents_container_->GetLayoutManager()); |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2665 } | 2666 } |
| 2666 | 2667 |
| 2667 extensions::ActiveTabPermissionGranter* | 2668 extensions::ActiveTabPermissionGranter* |
| 2668 BrowserView::GetActiveTabPermissionGranter() { | 2669 BrowserView::GetActiveTabPermissionGranter() { |
| 2669 content::WebContents* web_contents = GetActiveWebContents(); | 2670 content::WebContents* web_contents = GetActiveWebContents(); |
| 2670 if (!web_contents) | 2671 if (!web_contents) |
| 2671 return nullptr; | 2672 return nullptr; |
| 2672 return extensions::TabHelper::FromWebContents(web_contents) | 2673 return extensions::TabHelper::FromWebContents(web_contents) |
| 2673 ->active_tab_permission_granter(); | 2674 ->active_tab_permission_granter(); |
| 2674 } | 2675 } |
| OLD | NEW |