diff options
| -rw-r--r-- | chrome/browser/views/extensions/extension_shelf.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/views/extensions/extension_shelf.cc b/chrome/browser/views/extensions/extension_shelf.cc index 2bb567e..0d0fb0a 100644 --- a/chrome/browser/views/extensions/extension_shelf.cc +++ b/chrome/browser/views/extensions/extension_shelf.cc @@ -560,8 +560,8 @@ void ExtensionShelf::Toolstrip::HideShelfHandle(int delay_ms) { //////////////////////////////////////////////////////////////////////////////// ExtensionShelf::ExtensionShelf(Browser* browser) - : model_(browser->extension_shelf_model()), - browser_(browser) { + : browser_(browser), + model_(browser->extension_shelf_model()) { model_->AddObserver(this); LoadFromModel(); EnableCanvasFlippingForRTLUI(true); @@ -736,8 +736,6 @@ void ExtensionShelf::Layout() { int content_height = kShelfHeight - kTopMargin - kBottomMargin; int max_x = width() - kRightMargin; - int max_x_before = max_x; - if (OnNewTabPage()) { double current_state = 1 - size_animation_->GetCurrentValue(); x += static_cast<int>(static_cast<double> |