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

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: Created 7 years, 8 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 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 } 1227 }
1228 1228
1229 void BrowserView::ShowChromeToMobileBubble() { 1229 void BrowserView::ShowChromeToMobileBubble() {
1230 GetLocationBarView()->ShowChromeToMobileBubble(); 1230 GetLocationBarView()->ShowChromeToMobileBubble();
1231 } 1231 }
1232 1232
1233 #if defined(ENABLE_ONE_CLICK_SIGNIN) 1233 #if defined(ENABLE_ONE_CLICK_SIGNIN)
1234 void BrowserView::ShowOneClickSigninBubble( 1234 void BrowserView::ShowOneClickSigninBubble(
1235 OneClickSigninBubbleType type, 1235 OneClickSigninBubbleType type,
1236 const string16& email, 1236 const string16& email,
1237 const string16& error_message,
1237 const StartSyncCallback& start_sync_callback) { 1238 const StartSyncCallback& start_sync_callback) {
1238 OneClickSigninBubbleView::ShowBubble(type, email, toolbar_, 1239 OneClickSigninBubbleView::ShowBubble(type, email, error_message,
1239 start_sync_callback); 1240 toolbar_, start_sync_callback);
1240 } 1241 }
1241 #endif 1242 #endif
1242 1243
1243 void BrowserView::SetDownloadShelfVisible(bool visible) { 1244 void BrowserView::SetDownloadShelfVisible(bool visible) {
1244 // This can be called from the superclass destructor, when it destroys our 1245 // This can be called from the superclass destructor, when it destroys our
1245 // child views. At that point, browser_ is already gone. 1246 // child views. At that point, browser_ is already gone.
1246 if (browser_ == NULL) 1247 if (browser_ == NULL)
1247 return; 1248 return;
1248 1249
1249 if (visible && IsDownloadShelfVisible() != visible) { 1250 if (visible && IsDownloadShelfVisible() != visible) {
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 2726
2726 Browser* modal_browser = 2727 Browser* modal_browser =
2727 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2728 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2728 if (modal_browser && (browser_ != modal_browser)) { 2729 if (modal_browser && (browser_ != modal_browser)) {
2729 modal_browser->window()->FlashFrame(true); 2730 modal_browser->window()->FlashFrame(true);
2730 modal_browser->window()->Activate(); 2731 modal_browser->window()->Activate();
2731 } 2732 }
2732 2733
2733 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2734 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2734 } 2735 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698