| 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 "chrome/browser/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1145 | 1145 |
| 1146 int BrowserView::GetExtraRenderViewHeight() const { | 1146 int BrowserView::GetExtraRenderViewHeight() const { |
| 1147 // Currently this is only used on linux. | 1147 // Currently this is only used on linux. |
| 1148 return 0; | 1148 return 0; |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 void BrowserView::WebContentsFocused(WebContents* contents) { | 1151 void BrowserView::WebContentsFocused(WebContents* contents) { |
| 1152 contents_container_->OnWebContentsFocused(contents); | 1152 contents_container_->OnWebContentsFocused(contents); |
| 1153 } | 1153 } |
| 1154 | 1154 |
| 1155 void BrowserView::ShowPageInfo(Profile* profile, | 1155 void BrowserView::ShowPageInfo(content::WebContents* web_contents, |
| 1156 const GURL& url, | 1156 const GURL& url, |
| 1157 const SSLStatus& ssl, | 1157 const SSLStatus& ssl, |
| 1158 bool show_history) { | 1158 bool show_history) { |
| 1159 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), | 1159 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), |
| 1160 profile, url, ssl, show_history, browser_.get()); | 1160 web_contents, url, ssl, show_history, |
| 1161 browser_.get()); |
| 1161 } | 1162 } |
| 1162 | 1163 |
| 1163 void BrowserView::ShowWebsiteSettings(Profile* profile, | 1164 void BrowserView::ShowWebsiteSettings(Profile* profile, |
| 1164 TabContents* tab_contents, | 1165 TabContents* tab_contents, |
| 1165 const GURL& url, | 1166 const GURL& url, |
| 1166 const content::SSLStatus& ssl, | 1167 const content::SSLStatus& ssl, |
| 1167 bool show_history) { | 1168 bool show_history) { |
| 1168 WebsiteSettingsPopupView::ShowPopup( | 1169 WebsiteSettingsPopupView::ShowPopup( |
| 1169 GetLocationBarView()->location_icon_view(), profile, | 1170 GetLocationBarView()->location_icon_view(), profile, |
| 1170 tab_contents, url, ssl); | 1171 tab_contents, url, ssl); |
| (...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2473 this, | 2474 this, |
| 2474 tab_contents->web_contents()->GetRenderViewHost(), | 2475 tab_contents->web_contents()->GetRenderViewHost(), |
| 2475 password_generator, | 2476 password_generator, |
| 2476 browser_.get(), | 2477 browser_.get(), |
| 2477 tab_contents->password_manager()); | 2478 tab_contents->password_manager()); |
| 2478 | 2479 |
| 2479 views::BubbleDelegateView::CreateBubble(bubble); | 2480 views::BubbleDelegateView::CreateBubble(bubble); |
| 2480 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2481 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
| 2481 bubble->Show(); | 2482 bubble->Show(); |
| 2482 } | 2483 } |
| OLD | NEW |