diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-30 03:59:01 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-30 03:59:01 +0000 |
| commit | 941f179cca5affb618eafbc2e53763ac06e5af2d (patch) | |
| tree | 540a918608b20cc74122d8fa634d73289547984c /chrome/browser | |
| parent | d8f16ae0347635889c104a48269805c01901fc05 (diff) | |
| download | chromium_src-941f179cca5affb618eafbc2e53763ac06e5af2d.zip chromium_src-941f179cca5affb618eafbc2e53763ac06e5af2d.tar.gz chromium_src-941f179cca5affb618eafbc2e53763ac06e5af2d.tar.bz2 | |
Fix warnings in Linux build.
TBR=erikkay
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/173623
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -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> |