diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.gyp | 1 | ||||
| -rw-r--r-- | app/resource_bundle.cc | 4 | ||||
| -rw-r--r-- | app/resources/frame_default.png | bin | 2033 -> 1113 bytes | |||
| -rw-r--r-- | app/resources/frame_default_inactive.png | bin | 1521 -> 773 bytes | |||
| -rw-r--r-- | app/resources/window_bottom_left_corner.png | bin | 151 -> 139 bytes | |||
| -rw-r--r-- | app/resources/window_bottom_right_corner.png | bin | 152 -> 129 bytes | |||
| -rw-r--r-- | app/slide_animation_unittest.cc | 29 | ||||
| -rw-r--r-- | app/text_elider.cc | 9 | ||||
| -rw-r--r-- | app/text_elider_unittest.cc | 20 |
9 files changed, 16 insertions, 47 deletions
diff --git a/app/app.gyp b/app/app.gyp index 23e31c3..86afe36 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -45,7 +45,6 @@ '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 a2058ec..1793073 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(66, 116, 201); + SkColorSetRGB(77, 139, 217); const SkColor ResourceBundle::frame_color_inactive = - SkColorSetRGB(161, 182, 228); + SkColorSetRGB(184, 209, 240); 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 Binary files differindex ca9bcb2..3f4f7e9 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 Binary files differindex 348e2ce..a1eff41 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 Binary files differindex 88c420c..1d3c066 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 Binary files differindex 2595f0c..83cf5b9 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 deleted file mode 100644 index 8bc947f..0000000 --- a/app/slide_animation_unittest.cc +++ /dev/null @@ -1,29 +0,0 @@ -// 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 ccdb3e33..1098f82 100644 --- a/app/text_elider.cc +++ b/app/text_elider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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, - net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, NULL, NULL); + std::wstring url_string = net::FormatUrl(url, languages, true, + UnescapeRule::SPACES, &parsed, NULL, NULL); if (available_pixel_width <= 0) return url_string; @@ -363,8 +363,7 @@ SortedDisplayURL::SortedDisplayURL(const GURL& url, string16 host_minus_www = WideToUTF16Hack(net::StripWWW(host)); url_parse::Parsed parsed; display_url_ = WideToUTF16Hack(net::FormatUrl(url, languages, - net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, &prefix_end_, - NULL)); + true, 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 caf619d..d976333 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"www.google.com/intl/en/ads/"}, + L"http://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"www.google.com/intl/en/ads/?aLongQ" + kEllipsisStr}, + L"http://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"www.google.com/foo?bar"}, + {"http://www.google.com/foo?bar", L"http://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"foo.bar../"}, - {"http://xn--1lq90i.cn/foo", L"\x5317\x4eac.cn/foo"}, + {"http://foo.bar../", L"http://foo.bar../"}, + {"http://xn--1lq90i.cn/foo", L"http://\x5317\x4eac.cn/foo"}, {"http://me:mypass@secrethost.com:99/foo?bar#baz", - L"secrethost.com:99/foo?bar#baz"}, - {"http://me:mypass@ss%xxfdsf.com/foo", L"ss%25xxfdsf.com/foo"}, + L"http://secrethost.com:99/foo?bar#baz"}, + {"http://me:mypass@ss%xxfdsf.com/foo", L"http://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"www/\x4f60\x597d?q=\x4f60\x597d#\x4f60"}, + L"http://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"www/%E4%A0%E5%A5%BD?q=\x4f60\x597d#\x4f60"}, + L"http://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("www.google.com/", UTF16ToASCII(d_url.display_url())); + EXPECT_EQ("http://www.google.com/", UTF16ToASCII(d_url.display_url())); } // Verifies DisplayURL::Compare works correctly. |
