| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/views/extensions/extension_shelf.h" | 5 #include "chrome/browser/views/extensions/extension_shelf.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1122 return (browser_ && browser_->GetSelectedTabContents() && | 1122 return (browser_ && browser_->GetSelectedTabContents() && |
| 1123 browser_->GetSelectedTabContents()->IsExtensionShelfAlwaysVisible()); | 1123 browser_->GetSelectedTabContents()->IsExtensionShelfAlwaysVisible()); |
| 1124 } | 1124 } |
| 1125 | 1125 |
| 1126 void ExtensionShelf::OnFullscreenToggled(bool fullscreen) { | 1126 void ExtensionShelf::OnFullscreenToggled(bool fullscreen) { |
| 1127 if (fullscreen == fullscreen_) | 1127 if (fullscreen == fullscreen_) |
| 1128 return; | 1128 return; |
| 1129 fullscreen_ = fullscreen; | 1129 fullscreen_ = fullscreen; |
| 1130 if (!IsAlwaysShown() || IsOnTop()) | 1130 if (!IsAlwaysShown() || IsOnTop()) |
| 1131 return; | 1131 return; |
| 1132 if (fullscreen_) | 1132 size_animation_->Reset(fullscreen ? 0 : 1); |
| 1133 size_animation_->Hide(); | |
| 1134 else | |
| 1135 size_animation_->Show(); | |
| 1136 } | 1133 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 542001:
Fixes two fullscreen bugs on views/gtk:... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/