Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 13979003: Win: Display a native bubble (instead of the JS one) after the web signin flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase ALL the thigns Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 } 1180 }
1181 1181
1182 void BrowserView::ShowChromeToMobileBubble() { 1182 void BrowserView::ShowChromeToMobileBubble() {
1183 GetLocationBarView()->ShowChromeToMobileBubble(); 1183 GetLocationBarView()->ShowChromeToMobileBubble();
1184 } 1184 }
1185 1185
1186 #if defined(ENABLE_ONE_CLICK_SIGNIN) 1186 #if defined(ENABLE_ONE_CLICK_SIGNIN)
1187 void BrowserView::ShowOneClickSigninBubble( 1187 void BrowserView::ShowOneClickSigninBubble(
1188 OneClickSigninBubbleType type, 1188 OneClickSigninBubbleType type,
1189 const string16& email, 1189 const string16& email,
1190 const string16& error_message,
1190 const StartSyncCallback& start_sync_callback) { 1191 const StartSyncCallback& start_sync_callback) {
1191 OneClickSigninBubbleView::ShowBubble(type, email, toolbar_, 1192 OneClickSigninBubbleView::ShowBubble(type, email, error_message,
1192 start_sync_callback); 1193 toolbar_, start_sync_callback);
1193 } 1194 }
1194 #endif 1195 #endif
1195 1196
1196 void BrowserView::SetDownloadShelfVisible(bool visible) { 1197 void BrowserView::SetDownloadShelfVisible(bool visible) {
1197 // This can be called from the superclass destructor, when it destroys our 1198 // This can be called from the superclass destructor, when it destroys our
1198 // child views. At that point, browser_ is already gone. 1199 // child views. At that point, browser_ is already gone.
1199 if (browser_ == NULL) 1200 if (browser_ == NULL)
1200 return; 1201 return;
1201 1202
1202 if (visible && IsDownloadShelfVisible() != visible) { 1203 if (visible && IsDownloadShelfVisible() != visible) {
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after
2672 2673
2673 Browser* modal_browser = 2674 Browser* modal_browser =
2674 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2675 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2675 if (modal_browser && (browser_ != modal_browser)) { 2676 if (modal_browser && (browser_ != modal_browser)) {
2676 modal_browser->window()->FlashFrame(true); 2677 modal_browser->window()->FlashFrame(true);
2677 modal_browser->window()->Activate(); 2678 modal_browser->window()->Activate();
2678 } 2679 }
2679 2680
2680 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2681 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2681 } 2682 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698