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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1042 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { | 1042 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { |
1043 GetLocationBarView()->ShowStarBubble(url, !already_bookmarked); | 1043 GetLocationBarView()->ShowStarBubble(url, !already_bookmarked); |
1044 } | 1044 } |
1045 | 1045 |
1046 void BrowserView::ShowChromeToMobileBubble() { | 1046 void BrowserView::ShowChromeToMobileBubble() { |
1047 GetLocationBarView()->ShowChromeToMobileBubble(); | 1047 GetLocationBarView()->ShowChromeToMobileBubble(); |
1048 } | 1048 } |
1049 | 1049 |
1050 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 1050 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
1051 void BrowserView::ShowOneClickSigninBubble( | 1051 void BrowserView::ShowOneClickSigninBubble( |
1052 const base::Closure& learn_more_callback, | 1052 const base::Callback<void(bool)>& start_sync_callback) { |
1053 const base::Closure& advanced_callback) { | |
1054 OneClickSigninBubbleView::ShowBubble(toolbar_->app_menu(), | 1053 OneClickSigninBubbleView::ShowBubble(toolbar_->app_menu(), |
1055 learn_more_callback, | 1054 start_sync_callback); |
1056 advanced_callback); | |
1057 } | 1055 } |
1058 #endif | 1056 #endif |
1059 | 1057 |
1060 void BrowserView::SetDownloadShelfVisible(bool visible) { | 1058 void BrowserView::SetDownloadShelfVisible(bool visible) { |
1061 // This can be called from the superclass destructor, when it destroys our | 1059 // This can be called from the superclass destructor, when it destroys our |
1062 // child views. At that point, browser_ is already gone. | 1060 // child views. At that point, browser_ is already gone. |
1063 if (browser_ == NULL) | 1061 if (browser_ == NULL) |
1064 return; | 1062 return; |
1065 | 1063 |
1066 if (visible && IsDownloadShelfVisible() != visible) { | 1064 if (visible && IsDownloadShelfVisible() != visible) { |
(...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2387 return; | 2385 return; |
2388 | 2386 |
2389 PasswordGenerationBubbleView* bubble = | 2387 PasswordGenerationBubbleView* bubble = |
2390 new PasswordGenerationBubbleView(bounds, | 2388 new PasswordGenerationBubbleView(bounds, |
2391 this, | 2389 this, |
2392 web_contents->GetRenderViewHost()); | 2390 web_contents->GetRenderViewHost()); |
2393 views::BubbleDelegateView::CreateBubble(bubble); | 2391 views::BubbleDelegateView::CreateBubble(bubble); |
2394 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2392 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2395 bubble->Show(); | 2393 bubble->Show(); |
2396 } | 2394 } |
OLD | NEW |