| 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/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 } | 1023 } |
| 1024 | 1024 |
| 1025 void WebIntentPickerViews::OnInlineDisposition( | 1025 void WebIntentPickerViews::OnInlineDisposition( |
| 1026 const string16&, const GURL& url) { | 1026 const string16&, const GURL& url) { |
| 1027 if (!webview_) | 1027 if (!webview_) |
| 1028 webview_ = new views::WebView(tab_contents_->profile()); | 1028 webview_ = new views::WebView(tab_contents_->profile()); |
| 1029 | 1029 |
| 1030 inline_web_contents_.reset(WebContents::Create( | 1030 inline_web_contents_.reset(WebContents::Create( |
| 1031 tab_contents_->profile(), | 1031 tab_contents_->profile(), |
| 1032 tab_util::GetSiteInstanceForNewTab(tab_contents_->profile(), url), | 1032 tab_util::GetSiteInstanceForNewTab(tab_contents_->profile(), url), |
| 1033 MSG_ROUTING_NONE, NULL, NULL)); | 1033 MSG_ROUTING_NONE, NULL)); |
| 1034 // Does not take ownership, so we keep a scoped_ptr | 1034 // Does not take ownership, so we keep a scoped_ptr |
| 1035 // for the WebContents locally. | 1035 // for the WebContents locally. |
| 1036 webview_->SetWebContents(inline_web_contents_.get()); | 1036 webview_->SetWebContents(inline_web_contents_.get()); |
| 1037 Browser* browser = browser::FindBrowserWithWebContents( | 1037 Browser* browser = browser::FindBrowserWithWebContents( |
| 1038 tab_contents_->web_contents()); | 1038 tab_contents_->web_contents()); |
| 1039 inline_disposition_delegate_.reset( | 1039 inline_disposition_delegate_.reset( |
| 1040 new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(), | 1040 new WebIntentInlineDispositionDelegate(this, inline_web_contents_.get(), |
| 1041 browser)); | 1041 browser)); |
| 1042 content::WebContents* web_contents = webview_->GetWebContents(); | 1042 content::WebContents* web_contents = webview_->GetWebContents(); |
| 1043 | 1043 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 1191 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| 1192 views::ImageButton* close_button = new views::ImageButton(this); | 1192 views::ImageButton* close_button = new views::ImageButton(this); |
| 1193 close_button->SetImage(views::CustomButton::BS_NORMAL, | 1193 close_button->SetImage(views::CustomButton::BS_NORMAL, |
| 1194 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X)); | 1194 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X)); |
| 1195 close_button->SetImage(views::CustomButton::BS_HOT, | 1195 close_button->SetImage(views::CustomButton::BS_HOT, |
| 1196 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); | 1196 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); |
| 1197 close_button->SetImage(views::CustomButton::BS_PUSHED, | 1197 close_button->SetImage(views::CustomButton::BS_PUSHED, |
| 1198 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); | 1198 rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); |
| 1199 return close_button; | 1199 return close_button; |
| 1200 } | 1200 } |
| OLD | NEW |