chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc - Issue 10828247: launcher: Switch from views/ to ash/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

Issue 10828247: launcher: Switch from views/ to ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <vector>	5 #include <vector>

6	6

7 #include "base/file_path.h"	7 #include "base/file_path.h"

8 #include "base/time.h"	8 #include "base/time.h"

	9 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"

	10 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"

9 #include "chrome/browser/ui/browser.h"	11 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_tabstrip.h"	12 #include "chrome/browser/ui/browser_tabstrip.h"

11 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"

12 #include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h"

13 #include "chrome/browser/ui/views/frame/browser_view.h"	13 #include "chrome/browser/ui/views/frame/browser_view.h"

14 #include "chrome/common/favicon_url.h"	14 #include "chrome/common/favicon_url.h"

15 #include "chrome/common/icon_messages.h"	15 #include "chrome/common/icon_messages.h"

16 #include "chrome/test/base/in_process_browser_test.h"	16 #include "chrome/test/base/in_process_browser_test.h"

17 #include "chrome/test/base/ui_test_utils.h"	17 #include "chrome/test/base/ui_test_utils.h"

18 #include "content/public/browser/web_contents.h"	18 #include "content/public/browser/web_contents.h"

19 #include "content/public/browser/web_contents_delegate.h"	19 #include "content/public/browser/web_contents_delegate.h"

20 #include "net/test/test_server.h"	20 #include "net/test/test_server.h"

21 #include "testing/gtest/include/gtest/gtest.h"	21 #include "testing/gtest/include/gtest/gtest.h"

22	22

(...skipping 166 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 NavigateTo(panel_browser, "launcher-smallfavicon.html");	189 NavigateTo(panel_browser, "launcher-smallfavicon.html");

190 EXPECT_TRUE(WaitForFaviconDownlads(1));	190 EXPECT_TRUE(WaitForFaviconDownlads(1));

191 EXPECT_TRUE(favicon_loader->GetFavicon().empty());	191 EXPECT_TRUE(favicon_loader->GetFavicon().empty());

192 ASSERT_NO_FATAL_FAILURE(ResetDownloads());	192 ASSERT_NO_FATAL_FAILURE(ResetDownloads());

193	193

194 NavigateTo(panel_browser, "launcher-largefavicon.html");	194 NavigateTo(panel_browser, "launcher-largefavicon.html");

195 EXPECT_TRUE(WaitForFaviconDownlads(1));	195 EXPECT_TRUE(WaitForFaviconDownlads(1));

196 EXPECT_FALSE(favicon_loader->GetFavicon().empty());	196 EXPECT_FALSE(favicon_loader->GetFavicon().empty());

197 EXPECT_EQ(128, favicon_loader->GetFavicon().height());	197 EXPECT_EQ(128, favicon_loader->GetFavicon().height());

198 }	198 }

OLD	NEW