| 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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); | 760 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); |
| 761 } | 761 } |
| 762 | 762 |
| 763 /////////////////////////////////////////////////////////////////////////////// | 763 /////////////////////////////////////////////////////////////////////////////// |
| 764 // Browser, Assorted browser commands: | 764 // Browser, Assorted browser commands: |
| 765 | 765 |
| 766 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) { | 766 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) { |
| 767 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url); | 767 fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url); |
| 768 } | 768 } |
| 769 | 769 |
| 770 #if defined(OS_MACOSX) | |
| 771 void Browser::TogglePresentationMode() { | |
| 772 fullscreen_controller_->TogglePresentationMode(); | |
| 773 } | |
| 774 #endif | |
| 775 | |
| 776 bool Browser::SupportsWindowFeature(WindowFeature feature) const { | 770 bool Browser::SupportsWindowFeature(WindowFeature feature) const { |
| 777 return SupportsWindowFeatureImpl(feature, true); | 771 return SupportsWindowFeatureImpl(feature, true); |
| 778 } | 772 } |
| 779 | 773 |
| 780 bool Browser::CanSupportWindowFeature(WindowFeature feature) const { | 774 bool Browser::CanSupportWindowFeature(WindowFeature feature) const { |
| 781 return SupportsWindowFeatureImpl(feature, false); | 775 return SupportsWindowFeatureImpl(feature, false); |
| 782 } | 776 } |
| 783 | 777 |
| 784 void Browser::ToggleEncodingAutoDetect() { | 778 void Browser::ToggleEncodingAutoDetect() { |
| 785 content::RecordAction(UserMetricsAction("AutoDetectChange")); | 779 content::RecordAction(UserMetricsAction("AutoDetectChange")); |
| (...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2338 if (contents && !allow_js_access) { | 2332 if (contents && !allow_js_access) { |
| 2339 contents->web_contents()->GetController().LoadURL( | 2333 contents->web_contents()->GetController().LoadURL( |
| 2340 target_url, | 2334 target_url, |
| 2341 content::Referrer(), | 2335 content::Referrer(), |
| 2342 content::PAGE_TRANSITION_LINK, | 2336 content::PAGE_TRANSITION_LINK, |
| 2343 std::string()); // No extra headers. | 2337 std::string()); // No extra headers. |
| 2344 } | 2338 } |
| 2345 | 2339 |
| 2346 return contents != NULL; | 2340 return contents != NULL; |
| 2347 } | 2341 } |
| OLD | NEW |