Re-instate the temporary revert from r45267. That reverted certain

Omnibox, toolbar, tab animations, and other UI changes for purposes of
testing and merging into mstone-5.

Additionally reverts these CLs to fix the earlier revert:
r45271: [Mac] Image references missing from Omnibox revert.
r45268: GTK fix merge failure in uber-revert.

Additional revert which fixed a bug for the branch:
r45381: [Mac] Omnibox popup icons and text lined up under toolbar.

Slight merge conflict which should be good:
r45322: GTK: Implement OnDragCanceled() for autocomplete...

Also ++kThemePackVersion and regenerate the cached theme pak.

Re-instated changes:
r45213: GTK: Override cursor colors in chrome-theme mode.
r45103: Support drawing nano tabs in the tabstrip.
r45084: GTK: Position the EV certificate stuff inside a green bubble.
r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon...
r44957: GTK: Tint the geolocation icons in gtk mode.
r44943: Changes FormatURL to not strip http if the host starts with ft...
r44930: Remove an icon that is no longer used.
r44929: SSL UI changes, Windows, code side (images are separate).
r44859: SSL UI changes (icons).  TBRed since trybots hate binary patches.
r44822: GTK: Select better greens in the native omnibox popup.
r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat...
r44789: [Mac] Bookmark star missing on NTP and BMM.
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44678: Display the SECURITY_WARNING status in the location bar for the
r44648: [Mac] Add an arrow cursor rect for the location image.
r44615: Revert r44611 because it may have broken "unit_tests" on "Vist...
r44611: Display the SECURITY_WARNING status in the location bar for the
r44577: Revert 44572 - [Mac] Update locationbar icon as user types.
r44572: [Mac] Update location-bar icon as user types.
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
r44523: GTK: Prevent inappropriate drag of location bar location icon.
r44519: GTK: make the primary selection include the url's scheme when ...
r44492: [Mac] Fix search icon in keyword search to be right-side-up.
r44415: GTK: Update top padding on icons in the autocomplete popup.
r44401: GTK: Tint omnibox icons in GTK mode differently.
r44380: GTK: Move reload in gtk mode and fix omnibox popup location.
r44282: Fixes crash in autocomplete when typing some URLs. The problem
r44273: [Mac] PDF icons for omnibox nits.
r44269: Fix build break due to bad merge resolve
r44268: Shift omnibox dropdown in and up on Windows, and square off th...
r44178: GTK: fix TTS padding.
r44177: Round the top left and right edges of the toolbar.
r44171: Images only checkin for try server goodness.
r44163: GTK: fix padding of autocomplete popup.
r44152: [Mac] PDF icons for omnibox.
r44145: GTK: Theme the icons in the location bar and use GTK colors fo...
r44140: Strips http from the omnibox
r44131: Fixes bugs in new tab strip animations where they weren't doin...
r44116: Change the default theme colors.
r44117: Add newline to EOF to fix CrOS builder.
r44115: Make the bottom edges of the opaque frame rounded.
r44091: [Mac] No star icon or page actions in omnibox on popups.
r44087: Don't allow drag or click on location icon when editing in omn...
r44021: [GTK] Add TTS lens graphic to linux TTS box.
r44008: [Mac] Tweak location icon spacing in omnibox.
r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca...
r43972: Make the firstrun bubble point at a better spot now that the l...
r43971: [Mac] Location icon in omnibox as drag source.
r43970: Make the star and page action icons not appear on popup windows.
r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly
r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip:
r43787: Allow location icon to be dragged & dropped.  This also fixes ...
r43759: Changes end cap of tab-to-search images.
r43740: Change bookmark bar toggle to ctrl-shift-b.
r43723: Show Page Info dialog on mouse up, not mouse down.
r43677: Fix Mac build failure.
r43676: Replace omnibox icons with new set that are all the same size ...
r43596: Fix browser test TestStarButtonAccObj.
r43593: Disables TestStarButtonAccObj.
r43582: Changes tab strip to use BoundsAnimator for tab strip animatio...
r43563: GTK: don't show reload button for popup/app windows.
r43562: Star/reload shuffle, Windows version.
r43540: [Mac] Magnifying glass in keyword-search bubble.
r43482: Adds images needed for new tab animation. I'm separating this ...
r43422: Add reload mask resource.
r43392: GTK: make the location icon a drag source.
r43376: [Mac] Move star button into page-actions area of omnibox.
r43357: [Mac] Line up omnibox popup under field.
r43290: gtk: fix display of icons in omnibox popup
r43269: GTK: fix reload button.
r43249: [Mac] Rearrange SSL status icon/label in omnibox.
r43248: BrowserThemePack: Adds persistant ids for the reload endcaps.
r43241: GTK: more location bar updates.
r43191: Fix memory leak in BrowserThemePack.
r43154: GTK: set the new star button's ID
r43151: Fix bad conflict resolution for r43146.
r43146: GTK: toolbar reload/star shuffle.
r43025: Show the location bar icon (almost) all the time, and have its...
r43023: Add new images for new reload button. No code change.
r42782: Remove this icon, now that it's no longer used (due to my secu...
r42502: Omnibox M5 work, part 1: Security changes
r42245: Check in new icons for omnibox security changes alone, so that...

BUG=none
TEST=People go back to complaining about missing http://.
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 31 insertions, 48 deletions

diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
index d0252f1..3159bf7 100644
--- a/chrome/browser/browser_theme_pack.cc
+++ b/chrome/browser/browser_theme_pack.cc
@@ -4,37 +4,26 @@
 
 #include "chrome/browser/browser_theme_pack.h"
 
-#include <algorithm>
-#include <climits>
-#include <set>
-#include <vector>
-
 #include "app/resource_bundle.h"
 #include "base/data_pack.h"
-#include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/values.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/theme_resources_util.h"
-#include "chrome/common/extensions/extension.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/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkUnPreMultiply.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 = 7;
+const int kThemePackVersion = 8;
 
 // 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
@@ -131,42 +120,33 @@ PersistingImagesTable kPersistingImages[] = {
   { 21, IDR_FORWARD_H, NULL },
   { 22, IDR_FORWARD_P, NULL },
   { 23, IDR_RELOAD, NULL },
-  { 24, IDR_RELOAD_H, NULL },
-  { 25, IDR_RELOAD_P, NULL },
-  { 26, IDR_HOME, NULL },
-  { 27, IDR_HOME_H, NULL },
-  { 28, IDR_HOME_P, NULL },
-  { 29, IDR_STAR, NULL },
-  { 30, IDR_STAR_NOBORDER, NULL },
-  { 31, IDR_STAR_NOBORDER_CENTER, NULL },
-  { 32, IDR_STAR_D, NULL },
-  { 33, IDR_STAR_H, NULL },
-  { 34, IDR_STAR_P, NULL },
-  { 35, IDR_STARRED, NULL },
-  { 36, IDR_STARRED_NOBORDER, NULL },
-  { 37, IDR_STARRED_NOBORDER_CENTER, NULL },
-  { 38, IDR_STARRED_H, NULL },
-  { 39, IDR_STARRED_P, NULL },
-  { 40, IDR_GO, NULL },
-  { 41, IDR_GO_NOBORDER, NULL },
-  { 42, IDR_GO_NOBORDER_CENTER, NULL },
-  { 43, IDR_GO_H, NULL },
-  { 44, IDR_GO_P, NULL },
-  { 45, IDR_STOP, NULL },
-  { 46, IDR_STOP_NOBORDER, NULL },
-  { 47, IDR_STOP_NOBORDER_CENTER, NULL },
-  { 48, IDR_STOP_H, NULL },
-  { 49, IDR_STOP_P, NULL },
-  { 50, IDR_MENU_BOOKMARK, NULL },
-  { 51, IDR_MENU_PAGE, NULL },
-  { 52, IDR_MENU_PAGE_RTL, NULL },
-  { 53, IDR_MENU_CHROME, NULL },
-  { 54, IDR_MENU_CHROME_RTL, NULL },
-  { 55, IDR_MENU_DROPARROW, NULL },
-  { 56, IDR_THROBBER, NULL },
-  { 57, IDR_THROBBER_WAITING, NULL },
-  { 58, IDR_THROBBER_LIGHT, NULL },
-  { 59, IDR_LOCATIONBG, NULL }
+  { 24, IDR_RELOAD_NOBORDER, NULL },
+  { 25, IDR_RELOAD_NOBORDER_CENTER, NULL },
+  { 26, IDR_RELOAD_H, NULL },
+  { 27, IDR_RELOAD_P, NULL },
+  { 28, IDR_HOME, NULL },
+  { 29, IDR_HOME_H, NULL },
+  { 30, IDR_HOME_P, NULL },
+  { 31, IDR_GO, NULL },
+  { 32, IDR_GO_NOBORDER, NULL },
+  { 33, IDR_GO_NOBORDER_CENTER, NULL },
+  { 34, IDR_GO_H, NULL },
+  { 35, IDR_GO_P, NULL },
+  { 36, IDR_STOP, NULL },
+  { 37, IDR_STOP_NOBORDER, NULL },
+  { 38, IDR_STOP_NOBORDER_CENTER, NULL },
+  { 39, IDR_STOP_H, NULL },
+  { 40, IDR_STOP_P, NULL },
+  { 41, IDR_MENU_BOOKMARK, NULL },
+  { 42, IDR_MENU_PAGE, NULL },
+  { 43, IDR_MENU_PAGE_RTL, NULL },
+  { 44, IDR_MENU_CHROME, NULL },
+  { 45, IDR_MENU_CHROME_RTL, NULL },
+  { 46, IDR_MENU_DROPARROW, NULL },
+  { 47, IDR_THROBBER, NULL },
+  { 48, IDR_THROBBER_WAITING, NULL },
+  { 49, IDR_THROBBER_LIGHT, NULL },
+  { 50, IDR_LOCATIONBG, NULL }
 };
 
 int GetPersistentIDByName(const std::string& key) {
@@ -516,6 +496,8 @@ bool BrowserThemePack::GetDisplayProperty(int id, int* result) const {
 
 SkBitmap* BrowserThemePack::GetBitmapNamed(int idr_id) const {
   int prs_id = GetPersistentIDByIDR(idr_id);
+  if (prs_id == -1)
+    return NULL;
 
   // Check our cache of prepared images, first.
   ImageCache::const_iterator image_iter = prepared_images_.find(prs_id);
@@ -965,6 +947,7 @@ void BrowserThemePack::GenerateTintedButtons(
     for (std::set<int>::const_iterator it = idr_ids.begin();
          it != idr_ids.end(); ++it) {
       int prs_id = GetPersistentIDByIDR(*it);
+      DCHECK(prs_id > 0);
 
       // Fetch the image by IDR...
       scoped_ptr<SkBitmap> button(new SkBitmap(*rb.GetBitmapNamed(*it)));