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 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 base::FilePath::StringType(), | 881 base::FilePath::StringType(), |
882 parent_window, | 882 parent_window, |
883 NULL); | 883 NULL); |
884 } | 884 } |
885 | 885 |
886 void Browser::UpdateDownloadShelfVisibility(bool visible) { | 886 void Browser::UpdateDownloadShelfVisibility(bool visible) { |
887 if (GetStatusBubble()) | 887 if (GetStatusBubble()) |
888 GetStatusBubble()->UpdateDownloadShelfVisibility(visible); | 888 GetStatusBubble()->UpdateDownloadShelfVisibility(visible); |
889 } | 889 } |
890 | 890 |
| 891 void Browser::UpdateStatusBubblePosition() { |
| 892 if (GetStatusBubble()) |
| 893 GetStatusBubble()->Reposition(); |
| 894 } |
| 895 |
891 /////////////////////////////////////////////////////////////////////////////// | 896 /////////////////////////////////////////////////////////////////////////////// |
892 | 897 |
893 void Browser::UpdateUIForNavigationInTab(WebContents* contents, | 898 void Browser::UpdateUIForNavigationInTab(WebContents* contents, |
894 ui::PageTransition transition, | 899 ui::PageTransition transition, |
895 bool user_initiated) { | 900 bool user_initiated) { |
896 tab_strip_model_->TabNavigating(contents, transition); | 901 tab_strip_model_->TabNavigating(contents, transition); |
897 | 902 |
898 bool contents_is_selected = | 903 bool contents_is_selected = |
899 contents == tab_strip_model_->GetActiveWebContents(); | 904 contents == tab_strip_model_->GetActiveWebContents(); |
900 if (user_initiated && contents_is_selected && window()->GetLocationBar()) { | 905 if (user_initiated && contents_is_selected && window()->GetLocationBar()) { |
(...skipping 1701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2602 if (contents && !allow_js_access) { | 2607 if (contents && !allow_js_access) { |
2603 contents->web_contents()->GetController().LoadURL( | 2608 contents->web_contents()->GetController().LoadURL( |
2604 target_url, | 2609 target_url, |
2605 content::Referrer(), | 2610 content::Referrer(), |
2606 ui::PAGE_TRANSITION_LINK, | 2611 ui::PAGE_TRANSITION_LINK, |
2607 std::string()); // No extra headers. | 2612 std::string()); // No extra headers. |
2608 } | 2613 } |
2609 | 2614 |
2610 return contents != NULL; | 2615 return contents != NULL; |
2611 } | 2616 } |
OLD | NEW |