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 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1131 | 1131 |
1132 void BrowserView::WebContentsFocused(WebContents* contents) { | 1132 void BrowserView::WebContentsFocused(WebContents* contents) { |
1133 contents_container_->OnWebContentsFocused(contents); | 1133 contents_container_->OnWebContentsFocused(contents); |
1134 } | 1134 } |
1135 | 1135 |
1136 void BrowserView::ShowPageInfo(Profile* profile, | 1136 void BrowserView::ShowPageInfo(Profile* profile, |
1137 const GURL& url, | 1137 const GURL& url, |
1138 const SSLStatus& ssl, | 1138 const SSLStatus& ssl, |
1139 bool show_history) { | 1139 bool show_history) { |
1140 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), | 1140 browser::ShowPageInfoBubble(GetLocationBarView()->location_icon_view(), |
1141 profile, url, ssl, show_history); | 1141 profile, url, ssl, show_history, browser_.get()); |
1142 } | 1142 } |
1143 | 1143 |
1144 void BrowserView::ShowWebsiteSettings(Profile* profile, | 1144 void BrowserView::ShowWebsiteSettings(Profile* profile, |
1145 TabContentsWrapper* tab_contents_wrapper, | 1145 TabContentsWrapper* tab_contents_wrapper, |
1146 const GURL& url, | 1146 const GURL& url, |
1147 const content::SSLStatus& ssl, | 1147 const content::SSLStatus& ssl, |
1148 bool show_history) { | 1148 bool show_history) { |
1149 } | 1149 } |
1150 | 1150 |
1151 void BrowserView::ShowAppMenu() { | 1151 void BrowserView::ShowAppMenu() { |
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2415 return; | 2415 return; |
2416 | 2416 |
2417 PasswordGenerationBubbleView* bubble = | 2417 PasswordGenerationBubbleView* bubble = |
2418 new PasswordGenerationBubbleView(bounds, | 2418 new PasswordGenerationBubbleView(bounds, |
2419 this, | 2419 this, |
2420 web_contents->GetRenderViewHost()); | 2420 web_contents->GetRenderViewHost()); |
2421 views::BubbleDelegateView::CreateBubble(bubble); | 2421 views::BubbleDelegateView::CreateBubble(bubble); |
2422 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2422 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2423 bubble->Show(); | 2423 bubble->Show(); |
2424 } | 2424 } |
OLD | NEW |