Merge 143605 - grd file update for new 2x assets

chrome/browser/ui/intents/web_intent_picker.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/intents/web_intent_picker.h"
 
 #include <cmath>
 
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/gfx/size.h"
 
 namespace {
 
 // The minimum width of the inline disposition tab contents.
 const int kMinInlineDispositionWidth = 300;
 
 // The minimum height of the inline disposition tab contents.
 const int kMinInlineDispositionHeight = 150;
 
@@ skipping 41 matching lines @@
 
   // We don't need to test against the upper bound (kHalfStarMax); when the
   // fractional part is greater than kHalfStarMax, full_stars will be rounded
   // up, which means rating - full_stars is negative.
   bool half_star = rating - full_stars >= kHalfStarMin;
 
   return index == full_stars && half_star ?
       IDR_CWS_STAR_HALF :
       IDR_CWS_STAR_EMPTY;
 }