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 2417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2428 if (bookmark_app_controller_) | 2428 if (bookmark_app_controller_) |
2429 return bookmark_app_controller_->should_use_web_app_frame(); | 2429 return bookmark_app_controller_->should_use_web_app_frame(); |
2430 | 2430 |
2431 return false; | 2431 return false; |
2432 } | 2432 } |
2433 | 2433 |
2434 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, | 2434 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, |
2435 bool check_fullscreen) const { | 2435 bool check_fullscreen) const { |
2436 bool hide_ui_for_fullscreen = check_fullscreen && ShouldHideUIForFullscreen(); | 2436 bool hide_ui_for_fullscreen = check_fullscreen && ShouldHideUIForFullscreen(); |
2437 | 2437 |
2438 unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF; | 2438 unsigned int features = |
| 2439 FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF | FEATURE_SIDEBAR; |
2439 | 2440 |
2440 if (is_type_tabbed()) | 2441 if (is_type_tabbed()) |
2441 features |= FEATURE_BOOKMARKBAR; | 2442 features |= FEATURE_BOOKMARKBAR; |
2442 | 2443 |
2443 if (!hide_ui_for_fullscreen) { | 2444 if (!hide_ui_for_fullscreen) { |
2444 if (!is_type_tabbed()) | 2445 if (!is_type_tabbed()) |
2445 features |= FEATURE_TITLEBAR; | 2446 features |= FEATURE_TITLEBAR; |
2446 | 2447 |
2447 if (is_type_tabbed()) | 2448 if (is_type_tabbed()) |
2448 features |= FEATURE_TABSTRIP; | 2449 features |= FEATURE_TABSTRIP; |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2602 if (contents && !allow_js_access) { | 2603 if (contents && !allow_js_access) { |
2603 contents->web_contents()->GetController().LoadURL( | 2604 contents->web_contents()->GetController().LoadURL( |
2604 target_url, | 2605 target_url, |
2605 content::Referrer(), | 2606 content::Referrer(), |
2606 ui::PAGE_TRANSITION_LINK, | 2607 ui::PAGE_TRANSITION_LINK, |
2607 std::string()); // No extra headers. | 2608 std::string()); // No extra headers. |
2608 } | 2609 } |
2609 | 2610 |
2610 return contents != NULL; | 2611 return contents != NULL; |
2611 } | 2612 } |
OLD | NEW |