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 <algorithm> | 5 #include <algorithm> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/memory/scoped_vector.h" | 8 #include "base/memory/scoped_vector.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "base/timer.h" | 10 #include "base/timer.h" |
(...skipping 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1376 DCHECK(delegate_); | 1376 DCHECK(delegate_); |
1377 if (!webview_) | 1377 if (!webview_) |
1378 webview_ = new views::WebView(tab_contents_->profile()); | 1378 webview_ = new views::WebView(tab_contents_->profile()); |
1379 | 1379 |
1380 inline_web_contents_.reset(delegate_->CreateWebContentsForInlineDisposition( | 1380 inline_web_contents_.reset(delegate_->CreateWebContentsForInlineDisposition( |
1381 tab_contents_->profile(), url)); | 1381 tab_contents_->profile(), url)); |
1382 | 1382 |
1383 // Does not take ownership, so we keep a scoped_ptr | 1383 // Does not take ownership, so we keep a scoped_ptr |
1384 // for the WebContents locally. | 1384 // for the WebContents locally. |
1385 webview_->SetWebContents(inline_web_contents_.get()); | 1385 webview_->SetWebContents(inline_web_contents_.get()); |
1386 Browser* browser = browser::FindBrowserWithWebContents( | 1386 Browser* browser = chrome::FindBrowserWithWebContents( |
1387 tab_contents_->web_contents()); | 1387 tab_contents_->web_contents()); |
1388 inline_disposition_delegate_.reset( | 1388 inline_disposition_delegate_.reset( |
1389 new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(), | 1389 new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(), |
1390 browser)); | 1390 browser)); |
1391 | 1391 |
1392 inline_web_contents_->GetController().LoadURL( | 1392 inline_web_contents_->GetController().LoadURL( |
1393 url, | 1393 url, |
1394 content::Referrer(), | 1394 content::Referrer(), |
1395 content::PAGE_TRANSITION_AUTO_TOPLEVEL, | 1395 content::PAGE_TRANSITION_AUTO_TOPLEVEL, |
1396 std::string()); | 1396 std::string()); |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1595 if (inline_service) | 1595 if (inline_service) |
1596 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); | 1596 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); |
1597 } | 1597 } |
1598 | 1598 |
1599 void WebIntentPickerViews::RefreshExtensions() { | 1599 void WebIntentPickerViews::RefreshExtensions() { |
1600 DCHECK(extensions_); | 1600 DCHECK(extensions_); |
1601 extensions_->Update(); | 1601 extensions_->Update(); |
1602 contents_->Layout(); | 1602 contents_->Layout(); |
1603 SizeToContents(); | 1603 SizeToContents(); |
1604 } | 1604 } |
OLD | NEW |