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/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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
924 } | 924 } |
925 | 925 |
926 void Browser::CloseModalSigninWindow() { | 926 void Browser::CloseModalSigninWindow() { |
927 signin_view_controller_.CloseModalSignin(); | 927 signin_view_controller_.CloseModalSignin(); |
928 } | 928 } |
929 | 929 |
930 void Browser::ShowModalSyncConfirmationWindow() { | 930 void Browser::ShowModalSyncConfirmationWindow() { |
931 signin_view_controller_.ShowModalSyncConfirmationDialog(this); | 931 signin_view_controller_.ShowModalSyncConfirmationDialog(this); |
932 } | 932 } |
933 | 933 |
| 934 void Browser::ShowModalSigninErrorWindow() { |
| 935 signin_view_controller_.ShowModalSigninErrorDialog(this); |
| 936 } |
| 937 |
934 void Browser::RegisterKeepAlive() { | 938 void Browser::RegisterKeepAlive() { |
935 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER, | 939 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER, |
936 KeepAliveRestartOption::DISABLED)); | 940 KeepAliveRestartOption::DISABLED)); |
937 } | 941 } |
938 void Browser::UnregisterKeepAlive() { | 942 void Browser::UnregisterKeepAlive() { |
939 keep_alive_.reset(); | 943 keep_alive_.reset(); |
940 } | 944 } |
941 | 945 |
942 /////////////////////////////////////////////////////////////////////////////// | 946 /////////////////////////////////////////////////////////////////////////////// |
943 // Browser, PageNavigator implementation: | 947 // Browser, PageNavigator implementation: |
(...skipping 1656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2600 if (contents && !allow_js_access) { | 2604 if (contents && !allow_js_access) { |
2601 contents->web_contents()->GetController().LoadURL( | 2605 contents->web_contents()->GetController().LoadURL( |
2602 target_url, | 2606 target_url, |
2603 content::Referrer(), | 2607 content::Referrer(), |
2604 ui::PAGE_TRANSITION_LINK, | 2608 ui::PAGE_TRANSITION_LINK, |
2605 std::string()); // No extra headers. | 2609 std::string()); // No extra headers. |
2606 } | 2610 } |
2607 | 2611 |
2608 return contents != NULL; | 2612 return contents != NULL; |
2609 } | 2613 } |
OLD | NEW |