| 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 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2484 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 2484 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 2485 "467185 Browser::UpdateBookmarkBarState3")); | 2485 "467185 Browser::UpdateBookmarkBarState3")); |
| 2486 | 2486 |
| 2487 bool should_animate = reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE; | 2487 bool should_animate = reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE; |
| 2488 window_->BookmarkBarStateChanged(should_animate ? | 2488 window_->BookmarkBarStateChanged(should_animate ? |
| 2489 BookmarkBar::ANIMATE_STATE_CHANGE : | 2489 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 2490 BookmarkBar::DONT_ANIMATE_STATE_CHANGE); | 2490 BookmarkBar::DONT_ANIMATE_STATE_CHANGE); |
| 2491 } | 2491 } |
| 2492 | 2492 |
| 2493 bool Browser::ShouldHideUIForFullscreen() const { | 2493 bool Browser::ShouldHideUIForFullscreen() const { |
| 2494 // Windows and GTK remove the top controls in fullscreen, but Mac and Ash | 2494 // Windows and GTK remove the browser controls in fullscreen, but Mac and Ash |
| 2495 // keep the controls in a slide-down panel. | 2495 // keep the controls in a slide-down panel. |
| 2496 return window_ && window_->ShouldHideUIForFullscreen(); | 2496 return window_ && window_->ShouldHideUIForFullscreen(); |
| 2497 } | 2497 } |
| 2498 | 2498 |
| 2499 bool Browser::ShouldStartShutdown() const { | 2499 bool Browser::ShouldStartShutdown() const { |
| 2500 return BrowserList::GetInstance()->size() <= 1; | 2500 return BrowserList::GetInstance()->size() <= 1; |
| 2501 } | 2501 } |
| 2502 | 2502 |
| 2503 bool Browser::MaybeCreateBackgroundContents( | 2503 bool Browser::MaybeCreateBackgroundContents( |
| 2504 int32_t route_id, | 2504 int32_t route_id, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2577 if (contents && !allow_js_access) { | 2577 if (contents && !allow_js_access) { |
| 2578 contents->web_contents()->GetController().LoadURL( | 2578 contents->web_contents()->GetController().LoadURL( |
| 2579 target_url, | 2579 target_url, |
| 2580 content::Referrer(), | 2580 content::Referrer(), |
| 2581 ui::PAGE_TRANSITION_LINK, | 2581 ui::PAGE_TRANSITION_LINK, |
| 2582 std::string()); // No extra headers. | 2582 std::string()); // No extra headers. |
| 2583 } | 2583 } |
| 2584 | 2584 |
| 2585 return contents != NULL; | 2585 return contents != NULL; |
| 2586 } | 2586 } |
| OLD | NEW |