| 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 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 return DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE; | 817 return DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE; |
| 818 } | 818 } |
| 819 | 819 |
| 820 // Those are the only conditions under which we will block shutdown. | 820 // Those are the only conditions under which we will block shutdown. |
| 821 return DOWNLOAD_CLOSE_OK; | 821 return DOWNLOAD_CLOSE_OK; |
| 822 } | 822 } |
| 823 | 823 |
| 824 //////////////////////////////////////////////////////////////////////////////// | 824 //////////////////////////////////////////////////////////////////////////////// |
| 825 // Browser, Tab adding/showing functions: | 825 // Browser, Tab adding/showing functions: |
| 826 | 826 |
| 827 void Browser::WindowFullscreenStateWillChange() { |
| 828 exclusive_access_manager_->fullscreen_controller() |
| 829 ->WindowFullscreenStateWillChange(); |
| 830 } |
| 831 |
| 827 void Browser::WindowFullscreenStateChanged() { | 832 void Browser::WindowFullscreenStateChanged() { |
| 828 exclusive_access_manager_->fullscreen_controller() | 833 exclusive_access_manager_->fullscreen_controller() |
| 829 ->WindowFullscreenStateChanged(); | 834 ->WindowFullscreenStateChanged(); |
| 830 command_controller_->FullscreenStateChanged(); | 835 command_controller_->FullscreenStateChanged(); |
| 831 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); | 836 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); |
| 832 } | 837 } |
| 833 | 838 |
| 834 /////////////////////////////////////////////////////////////////////////////// | 839 /////////////////////////////////////////////////////////////////////////////// |
| 835 // Browser, Assorted browser commands: | 840 // Browser, Assorted browser commands: |
| 836 | 841 |
| (...skipping 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2627 // new window later, thus we need to navigate the window now. | 2632 // new window later, thus we need to navigate the window now. |
| 2628 if (contents) { | 2633 if (contents) { |
| 2629 contents->web_contents()->GetController().LoadURL( | 2634 contents->web_contents()->GetController().LoadURL( |
| 2630 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, | 2635 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
| 2631 std::string()); // No extra headers. | 2636 std::string()); // No extra headers. |
| 2632 } | 2637 } |
| 2633 } | 2638 } |
| 2634 | 2639 |
| 2635 return contents != NULL; | 2640 return contents != NULL; |
| 2636 } | 2641 } |
| OLD | NEW |