| 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 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2555 if (hosted_app_controller_) | 2555 if (hosted_app_controller_) |
| 2556 return hosted_app_controller_->should_use_web_app_frame(); | 2556 return hosted_app_controller_->should_use_web_app_frame(); |
| 2557 | 2557 |
| 2558 return false; | 2558 return false; |
| 2559 } | 2559 } |
| 2560 | 2560 |
| 2561 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, | 2561 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, |
| 2562 bool check_fullscreen) const { | 2562 bool check_fullscreen) const { |
| 2563 bool hide_ui_for_fullscreen = check_fullscreen && ShouldHideUIForFullscreen(); | 2563 bool hide_ui_for_fullscreen = check_fullscreen && ShouldHideUIForFullscreen(); |
| 2564 | 2564 |
| 2565 unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF; | 2565 unsigned int features = FEATURE_INFOBAR; |
| 2566 | 2566 |
| 2567 if (is_type_tabbed()) | 2567 if (is_type_tabbed()) |
| 2568 features |= FEATURE_BOOKMARKBAR; | 2568 features |= FEATURE_BOOKMARKBAR; |
| 2569 | 2569 |
| 2570 if (!hide_ui_for_fullscreen) { | 2570 if (!hide_ui_for_fullscreen) { |
| 2571 if (!is_type_tabbed()) | 2571 if (!is_type_tabbed()) |
| 2572 features |= FEATURE_TITLEBAR; | 2572 features |= FEATURE_TITLEBAR; |
| 2573 | 2573 |
| 2574 if (is_type_tabbed()) | 2574 if (is_type_tabbed()) |
| 2575 features |= FEATURE_TABSTRIP; | 2575 features |= FEATURE_TABSTRIP; |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2730 if (contents && !allow_js_access) { | 2730 if (contents && !allow_js_access) { |
| 2731 contents->web_contents()->GetController().LoadURL( | 2731 contents->web_contents()->GetController().LoadURL( |
| 2732 target_url, | 2732 target_url, |
| 2733 content::Referrer(), | 2733 content::Referrer(), |
| 2734 ui::PAGE_TRANSITION_LINK, | 2734 ui::PAGE_TRANSITION_LINK, |
| 2735 std::string()); // No extra headers. | 2735 std::string()); // No extra headers. |
| 2736 } | 2736 } |
| 2737 | 2737 |
| 2738 return contents != NULL; | 2738 return contents != NULL; |
| 2739 } | 2739 } |
| OLD | NEW |