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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 2348423002: [Signin Error Dialog] (3/3) Added the triggering code (Closed)
Patch Set: Fix malformed function declaration on mac. Created 4 years, 2 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 } 887 }
888 888
889 void Browser::CloseModalSigninWindow() { 889 void Browser::CloseModalSigninWindow() {
890 signin_view_controller_.CloseModalSignin(); 890 signin_view_controller_.CloseModalSignin();
891 } 891 }
892 892
893 void Browser::ShowModalSyncConfirmationWindow() { 893 void Browser::ShowModalSyncConfirmationWindow() {
894 signin_view_controller_.ShowModalSyncConfirmationDialog(this); 894 signin_view_controller_.ShowModalSyncConfirmationDialog(this);
895 } 895 }
896 896
897 void Browser::ShowModalSigninErrorWindow() {
898 signin_view_controller_.ShowModalSigninErrorDialog(this);
899 }
900
897 void Browser::RegisterKeepAlive() { 901 void Browser::RegisterKeepAlive() {
898 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER, 902 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER,
899 KeepAliveRestartOption::DISABLED)); 903 KeepAliveRestartOption::DISABLED));
900 } 904 }
901 void Browser::UnregisterKeepAlive() { 905 void Browser::UnregisterKeepAlive() {
902 keep_alive_.reset(); 906 keep_alive_.reset();
903 } 907 }
904 908
905 /////////////////////////////////////////////////////////////////////////////// 909 ///////////////////////////////////////////////////////////////////////////////
906 // Browser, PageNavigator implementation: 910 // Browser, PageNavigator implementation:
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
2564 if (contents && !allow_js_access) { 2568 if (contents && !allow_js_access) {
2565 contents->web_contents()->GetController().LoadURL( 2569 contents->web_contents()->GetController().LoadURL(
2566 target_url, 2570 target_url,
2567 content::Referrer(), 2571 content::Referrer(),
2568 ui::PAGE_TRANSITION_LINK, 2572 ui::PAGE_TRANSITION_LINK,
2569 std::string()); // No extra headers. 2573 std::string()); // No extra headers.
2570 } 2574 }
2571 2575
2572 return contents != NULL; 2576 return contents != NULL;
2573 } 2577 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698