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

9 files changed, 47 insertions, 16 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 893af8d..adc1f76 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -45,6 +45,7 @@
         'l10n_util_unittest.cc',
         'os_exchange_data_win_unittest.cc',
         'run_all_unittests.cc',
+        'slide_animation_unittest.cc',
         'system_monitor_unittest.cc',
         'test_suite.h',
         'text_elider_unittest.cc',
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index 1793073..a2058ec 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -16,9 +16,9 @@ ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 // TODO(glen): Finish moving these into theme provider (dialogs still
 //    depend on these colors).
 const SkColor ResourceBundle::frame_color =
-     SkColorSetRGB(77, 139, 217);
+     SkColorSetRGB(66, 116, 201);
 const SkColor ResourceBundle::frame_color_inactive =
-     SkColorSetRGB(184, 209, 240);
+     SkColorSetRGB(161, 182, 228);
 const SkColor ResourceBundle::frame_color_app_panel =
      SK_ColorWHITE;
 const SkColor ResourceBundle::frame_color_app_panel_inactive =
diff --git a/app/resources/frame_default.png b/app/resources/frame_default.png
index 3f4f7e9..ca9bcb2 100644
--- a/app/resources/frame_default.png
+++ b/app/resources/frame_default.png
diff --git a/app/resources/frame_default_inactive.png b/app/resources/frame_default_inactive.png
index a1eff41..348e2ce 100644
--- a/app/resources/frame_default_inactive.png
+++ b/app/resources/frame_default_inactive.png
diff --git a/app/resources/window_bottom_left_corner.png b/app/resources/window_bottom_left_corner.png
index 1d3c066..88c420c 100644
--- a/app/resources/window_bottom_left_corner.png
+++ b/app/resources/window_bottom_left_corner.png
diff --git a/app/resources/window_bottom_right_corner.png b/app/resources/window_bottom_right_corner.png
index 83cf5b9..2595f0c 100644
--- a/app/resources/window_bottom_right_corner.png
+++ b/app/resources/window_bottom_right_corner.png
diff --git a/app/slide_animation_unittest.cc b/app/slide_animation_unittest.cc
new file mode 100644
index 0000000..8bc947f
--- /dev/null
+++ b/app/slide_animation_unittest.cc
@@ -0,0 +1,29 @@
+// 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 "app/slide_animation.h"
+#include "app/test_animation_delegate.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class SlideAnimationTest: public testing::Test {
+ private:
+  MessageLoopForUI message_loop_;
+};
+
+// Tests that delegate is not notified when animation is running and is deleted.
+// (Such a scenario would cause problems for BoundsAnimator).
+TEST_F(SlideAnimationTest, DontNotifyOnDelete) {
+  TestAnimationDelegate delegate;
+  scoped_ptr<SlideAnimation> animation(new SlideAnimation(&delegate));
+
+  // Start the animation.
+  animation->Show();
+
+  // Delete the animation.
+  animation.reset();
+
+  // Make sure the delegate wasn't notified.
+  EXPECT_FALSE(delegate.finished());
+  EXPECT_FALSE(delegate.canceled());
+}
diff --git a/app/text_elider.cc b/app/text_elider.cc
index 1098f82..ccdb3e33 100644
--- a/app/text_elider.cc
+++ b/app/text_elider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -37,8 +37,8 @@ std::wstring ElideUrl(const GURL& url,
                       const std::wstring& languages) {
   // Get a formatted string and corresponding parsing of the url.
   url_parse::Parsed parsed;
-  std::wstring url_string = net::FormatUrl(url, languages, true,
-      UnescapeRule::SPACES, &parsed, NULL, NULL);
+  std::wstring url_string = net::FormatUrl(url, languages,
+      net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, NULL, NULL);
   if (available_pixel_width <= 0)
     return url_string;
 
@@ -363,7 +363,8 @@ SortedDisplayURL::SortedDisplayURL(const GURL& url,
   string16 host_minus_www = WideToUTF16Hack(net::StripWWW(host));
   url_parse::Parsed parsed;
   display_url_ = WideToUTF16Hack(net::FormatUrl(url, languages,
-      true, UnescapeRule::SPACES, &parsed, &prefix_end_, NULL));
+      net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, &prefix_end_,
+      NULL));
   if (sort_host_.length() > host_minus_www.length()) {
     prefix_end_ += sort_host_.length() - host_minus_www.length();
     sort_host_.swap(host_minus_www);
diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc
index d976333..caf619d 100644
--- a/app/text_elider_unittest.cc
+++ b/app/text_elider_unittest.cc
@@ -55,7 +55,7 @@ TEST(TextEliderTest, TestGeneralEliding) {
   const std::wstring kEllipsisStr(kEllipsis);
   Testcase testcases[] = {
     {"http://www.google.com/intl/en/ads/",
-     L"http://www.google.com/intl/en/ads/"},
+     L"www.google.com/intl/en/ads/"},
     {"http://www.google.com/intl/en/ads/", L"www.google.com/intl/en/ads/"},
 // TODO(port): make this test case work on mac.
 #if !defined(OS_MACOSX)
@@ -73,7 +73,7 @@ TEST(TextEliderTest, TestGeneralEliding) {
     {"http://subdomain.foo.com/bar/filename.html",
      kEllipsisStr + L"foo.com/" + kEllipsisStr + L"/filename.html"},
     {"http://www.google.com/intl/en/ads/?aLongQueryWhichIsNotRequired",
-     L"http://www.google.com/intl/en/ads/?aLongQ" + kEllipsisStr},
+     L"www.google.com/intl/en/ads/?aLongQ" + kEllipsisStr},
   };
 
   RunTest(testcases, arraysize(testcases));
@@ -83,7 +83,7 @@ TEST(TextEliderTest, TestGeneralEliding) {
 TEST(TextEliderTest, TestMoreEliding) {
   const std::wstring kEllipsisStr(kEllipsis);
   Testcase testcases[] = {
-    {"http://www.google.com/foo?bar", L"http://www.google.com/foo?bar"},
+    {"http://www.google.com/foo?bar", L"www.google.com/foo?bar"},
     {"http://xyz.google.com/foo?bar", L"xyz.google.com/foo?" + kEllipsisStr},
     {"http://xyz.google.com/foo?bar", L"xyz.google.com/foo" + kEllipsisStr},
     {"http://xyz.google.com/foo?bar", L"xyz.google.com/fo" + kEllipsisStr},
@@ -91,11 +91,11 @@ TEST(TextEliderTest, TestMoreEliding) {
     {"", L""},
     {"http://foo.bar..example.com...hello/test/filename.html",
      L"foo.bar..example.com...hello/" + kEllipsisStr + L"/filename.html"},
-    {"http://foo.bar../", L"http://foo.bar../"},
-    {"http://xn--1lq90i.cn/foo", L"http://\x5317\x4eac.cn/foo"},
+    {"http://foo.bar../", L"foo.bar../"},
+    {"http://xn--1lq90i.cn/foo", L"\x5317\x4eac.cn/foo"},
     {"http://me:mypass@secrethost.com:99/foo?bar#baz",
-     L"http://secrethost.com:99/foo?bar#baz"},
-    {"http://me:mypass@ss%xxfdsf.com/foo", L"http://ss%25xxfdsf.com/foo"},
+     L"secrethost.com:99/foo?bar#baz"},
+    {"http://me:mypass@ss%xxfdsf.com/foo", L"ss%25xxfdsf.com/foo"},
     {"mailto:elgoato@elgoato.com", L"mailto:elgoato@elgoato.com"},
     {"javascript:click(0)", L"javascript:click(0)"},
     {"https://chess.eecs.berkeley.edu:4430/login/arbitfilename",
@@ -105,13 +105,13 @@ TEST(TextEliderTest, TestMoreEliding) {
 
     // Unescaping.
     {"http://www/%E4%BD%A0%E5%A5%BD?q=%E4%BD%A0%E5%A5%BD#\xe4\xbd\xa0",
-     L"http://www/\x4f60\x597d?q=\x4f60\x597d#\x4f60"},
+     L"www/\x4f60\x597d?q=\x4f60\x597d#\x4f60"},
 
     // Invalid unescaping for path. The ref will always be valid UTF-8. We don't
     // bother to do too many edge cases, since these are handled by the escaper
     // unittest.
     {"http://www/%E4%A0%E5%A5%BD?q=%E4%BD%A0%E5%A5%BD#\xe4\xbd\xa0",
-     L"http://www/%E4%A0%E5%A5%BD?q=\x4f60\x597d#\x4f60"},
+     L"www/%E4%A0%E5%A5%BD?q=\x4f60\x597d#\x4f60"},
   };
 
   RunTest(testcases, arraysize(testcases));
@@ -229,7 +229,7 @@ TEST(TextEliderTest, ElideTextLongStrings) {
 // Verifies display_url is set correctly.
 TEST(TextEliderTest, SortedDisplayURL) {
   gfx::SortedDisplayURL d_url(GURL("http://www.google.com/"), std::wstring());
-  EXPECT_EQ("http://www.google.com/", UTF16ToASCII(d_url.display_url()));
+  EXPECT_EQ("www.google.com/", UTF16ToASCII(d_url.display_url()));
 }
 
 // Verifies DisplayURL::Compare works correctly.