| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 void BrowserView::ShowChromeToMobileBubble() { | 1190 void BrowserView::ShowChromeToMobileBubble() { |
| 1191 GetLocationBarView()->ShowChromeToMobileBubble(); | 1191 GetLocationBarView()->ShowChromeToMobileBubble(); |
| 1192 } | 1192 } |
| 1193 | 1193 |
| 1194 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 1194 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 1195 void BrowserView::ShowOneClickSigninBubble( | 1195 void BrowserView::ShowOneClickSigninBubble( |
| 1196 OneClickSigninBubbleType type, | 1196 OneClickSigninBubbleType type, |
| 1197 const string16& email, | 1197 const string16& email, |
| 1198 const string16& error_message, |
| 1198 const StartSyncCallback& start_sync_callback) { | 1199 const StartSyncCallback& start_sync_callback) { |
| 1199 OneClickSigninBubbleView::ShowBubble(type, email, toolbar_, | 1200 OneClickSigninBubbleView::ShowBubble(type, email, error_message, |
| 1200 start_sync_callback); | 1201 toolbar_, start_sync_callback); |
| 1201 } | 1202 } |
| 1202 #endif | 1203 #endif |
| 1203 | 1204 |
| 1204 void BrowserView::SetDownloadShelfVisible(bool visible) { | 1205 void BrowserView::SetDownloadShelfVisible(bool visible) { |
| 1205 // This can be called from the superclass destructor, when it destroys our | 1206 // This can be called from the superclass destructor, when it destroys our |
| 1206 // child views. At that point, browser_ is already gone. | 1207 // child views. At that point, browser_ is already gone. |
| 1207 if (browser_ == NULL) | 1208 if (browser_ == NULL) |
| 1208 return; | 1209 return; |
| 1209 | 1210 |
| 1210 if (visible && IsDownloadShelfVisible() != visible) { | 1211 if (visible && IsDownloadShelfVisible() != visible) { |
| (...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2680 | 2681 |
| 2681 Browser* modal_browser = | 2682 Browser* modal_browser = |
| 2682 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2683 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
| 2683 if (modal_browser && (browser_ != modal_browser)) { | 2684 if (modal_browser && (browser_ != modal_browser)) { |
| 2684 modal_browser->window()->FlashFrame(true); | 2685 modal_browser->window()->FlashFrame(true); |
| 2685 modal_browser->window()->Activate(); | 2686 modal_browser->window()->Activate(); |
| 2686 } | 2687 } |
| 2687 | 2688 |
| 2688 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2689 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
| 2689 } | 2690 } |
| OLD | NEW |