| 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 // the throbber will show the default favicon for a split second when | 922 // the throbber will show the default favicon for a split second when |
| 923 // navigating away from the new tab page. | 923 // navigating away from the new tab page. |
| 924 ScheduleUIUpdate(contents, content::INVALIDATE_TYPE_URL); | 924 ScheduleUIUpdate(contents, content::INVALIDATE_TYPE_URL); |
| 925 | 925 |
| 926 if (contents_is_selected && | 926 if (contents_is_selected && |
| 927 (window()->IsActive() || action == chrome::NavigateParams::SHOW_WINDOW)) { | 927 (window()->IsActive() || action == chrome::NavigateParams::SHOW_WINDOW)) { |
| 928 contents->SetInitialFocus(); | 928 contents->SetInitialFocus(); |
| 929 } | 929 } |
| 930 } | 930 } |
| 931 | 931 |
| 932 void Browser::ShowModalSigninWindow(profiles::BubbleViewMode mode, | |
| 933 signin_metrics::AccessPoint access_point) { | |
| 934 signin_view_controller_.ShowModalSignin(mode, this, access_point); | |
| 935 } | |
| 936 | |
| 937 void Browser::CloseModalSigninWindow() { | |
| 938 signin_view_controller_.CloseModalSignin(); | |
| 939 } | |
| 940 | |
| 941 void Browser::ShowModalSyncConfirmationWindow() { | |
| 942 signin_view_controller_.ShowModalSyncConfirmationDialog(this); | |
| 943 } | |
| 944 | |
| 945 void Browser::ShowModalSigninErrorWindow() { | |
| 946 signin_view_controller_.ShowModalSigninErrorDialog(this); | |
| 947 } | |
| 948 | |
| 949 void Browser::RegisterKeepAlive() { | 932 void Browser::RegisterKeepAlive() { |
| 950 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER, | 933 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER, |
| 951 KeepAliveRestartOption::DISABLED)); | 934 KeepAliveRestartOption::DISABLED)); |
| 952 } | 935 } |
| 953 void Browser::UnregisterKeepAlive() { | 936 void Browser::UnregisterKeepAlive() { |
| 954 keep_alive_.reset(); | 937 keep_alive_.reset(); |
| 955 } | 938 } |
| 956 | 939 |
| 957 /////////////////////////////////////////////////////////////////////////////// | 940 /////////////////////////////////////////////////////////////////////////////// |
| 958 // Browser, PageNavigator implementation: | 941 // Browser, PageNavigator implementation: |
| (...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2638 // new window later, thus we need to navigate the window now. | 2621 // new window later, thus we need to navigate the window now. |
| 2639 if (contents) { | 2622 if (contents) { |
| 2640 contents->web_contents()->GetController().LoadURL( | 2623 contents->web_contents()->GetController().LoadURL( |
| 2641 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, | 2624 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
| 2642 std::string()); // No extra headers. | 2625 std::string()); // No extra headers. |
| 2643 } | 2626 } |
| 2644 } | 2627 } |
| 2645 | 2628 |
| 2646 return contents != NULL; | 2629 return contents != NULL; |
| 2647 } | 2630 } |
| OLD | NEW |