Mac: Update zoom bubble UI

chrome/browser/ui/zoom/zoom_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 36 matching lines @@
       browser_context_)->RemoveZoomLevelChangedCallback(
           zoom_callback_);
 }
 
 bool ZoomController::IsAtDefaultZoom() const {
   return content::ZoomValuesEqual(web_contents()->GetZoomLevel(),
                                   default_zoom_level_.GetValue());
 }
 
 int ZoomController::GetResourceForZoomLevel() const {
-  DCHECK(!IsAtDefaultZoom());
   double zoom = web_contents()->GetZoomLevel();
+  if (IsAtDefaultZoom())
+    return IDR_ZOOM_NORMAL;

[Dan Beam, 2013/02/26 18:36:31]

  if (IsAtDefaultZoom())
    return IDR_ZOOM_NORMAL;
  double zoom = web_contents()->GetZoomLevel();
  return zoom > default_zoom_level_.GetValue() ? IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;

(declare locals as close as possible -
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Local_...)

[sail, 2013/02/26 22:04:15]

Done.

   return zoom > default_zoom_level_.GetValue() ? IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
 }
 
 void ZoomController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // If the main frame's content has changed, the new page may have a different
   // zoom level from the old one.
   UpdateState(std::string());
 }
@@ skipping 14 matching lines @@
       return;
     }
   }
 
   bool dummy;
   zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);
 
   if (observer_)
     observer_->OnZoomChanged(web_contents(), !host.empty());
 }