Fix up the Windows omnibox after the recent endcap removal. This fixes most ...

chrome/browser/browser_theme_pack.cc

 // Copyright (c) 2010 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/browser_theme_pack.h"
 
 #include "app/resource_bundle.h"
 #include "base/data_pack.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chrome_thread.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this.
-const int kThemePackVersion = 10;
+const int kThemePackVersion = 11;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // int32_t. kHeaderID should always have the maximum value because we want the
 // "header" to be written last. That way we can detect whether the pack was
 // successfully written and ignore and regenerate if it was only partially
 // written (i.e. chrome crashed on a different thread while writing the pack).
 const int kHeaderID = UINT_MAX - 1;
 const int kTintsID = UINT_MAX - 2;
 const int kColorsID = UINT_MAX - 3;
 const int kDisplayPropertiesID = UINT_MAX - 4;
@@ skipping 84 matching lines @@
   { 22, IDR_FORWARD_P, NULL },
   { 23, IDR_HOME, NULL },
   { 24, IDR_HOME_H, NULL },
   { 25, IDR_HOME_P, NULL },
   { 26, IDR_RELOAD, NULL },
   { 27, IDR_RELOAD_H, NULL },
   { 28, IDR_RELOAD_P, NULL },
   { 29, IDR_STOP, NULL },
   { 30, IDR_STOP_H, NULL },
   { 31, IDR_STOP_P, NULL },
-  { 32, IDR_LOCATIONBG, NULL },
-  { 33, IDR_MENU_BOOKMARK, NULL },
-  { 34, IDR_MENU_PAGE, NULL },
-  { 35, IDR_MENU_PAGE_RTL, NULL },
-  { 36, IDR_MENU_CHROME, NULL },
-  { 37, IDR_MENU_CHROME_RTL, NULL },
-  { 38, IDR_MENU_DROPARROW, NULL },
-  { 39, IDR_THROBBER, NULL },
-  { 40, IDR_THROBBER_WAITING, NULL },
-  { 41, IDR_THROBBER_LIGHT, NULL },
+  { 32, IDR_LOCATIONBG_C, NULL },
+  { 33, IDR_LOCATIONBG_L, NULL },
+  { 34, IDR_LOCATIONBG_R, NULL },
+  { 35, IDR_MENU_BOOKMARK, NULL },
+  { 36, IDR_MENU_PAGE, NULL },
+  { 37, IDR_MENU_PAGE_RTL, NULL },
+  { 38, IDR_MENU_CHROME, NULL },
+  { 39, IDR_MENU_CHROME_RTL, NULL },
+  { 40, IDR_MENU_DROPARROW, NULL },
+  { 41, IDR_THROBBER, NULL },
+  { 42, IDR_THROBBER_WAITING, NULL },
+  { 43, IDR_THROBBER_LIGHT, NULL },
 };
 
 int GetPersistentIDByName(const std::string& key) {
   for (size_t i = 0; i < arraysize(kPersistingImages); ++i) {
     if (kPersistingImages[i].key != NULL &&
         base::strcasecmp(key.c_str(), kPersistingImages[i].key) == 0) {
       return kPersistingImages[i].persistent_id;
     }
   }
 
@@ skipping 879 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return BrowserThemeProvider::GetDefaultTint(id);
 }