chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc - Issue 9570044: Rename chrome/browser/ui/views/{aura => 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/views/ash/launcher/launcher_updater_unittest.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 9 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/views/ash/launcher/launcher_updater.cc ('k') | chrome/browser/ui/views/ash/multiple_window_indicator_button.h » ('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 "chrome/browser/ui/views/aura/launcher/launcher_updater.h"	5 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"

6	6

7 #include <map>	7 #include <map>

8 #include <string>	8 #include <string>

9	9

10 #include "ash/launcher/launcher_model.h"	10 #include "ash/launcher/launcher_model.h"

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

13 #include "chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.h"	13 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"

14 #include "chrome/browser/tabs/tab_strip_model.h"	14 #include "chrome/browser/tabs/tab_strip_model.h"

15 #include "chrome/browser/tabs/test_tab_strip_model_delegate.h"	15 #include "chrome/browser/tabs/test_tab_strip_model_delegate.h"

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

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

18 #include "content/browser/tab_contents/test_tab_contents.h"	18 #include "content/browser/tab_contents/test_tab_contents.h"

19 #include "content/test/test_browser_thread.h"	19 #include "content/test/test_browser_thread.h"

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

21 #include "third_party/skia/include/core/SkBitmap.h"	21 #include "third_party/skia/include/core/SkBitmap.h"

22 #include "ui/aura/window.h"	22 #include "ui/aura/window.h"

23	23

(...skipping 551 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
575 EXPECT_EQ("2", GetAppID(id2));	575 EXPECT_EQ("2", GetAppID(id2));

576 EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_WINDOW,	576 EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_WINDOW,

577 launcher_delegate_->GetAppType(id2));	577 launcher_delegate_->GetAppType(id2));

578 EXPECT_TRUE(launcher_delegate_->IsPinned(id2));	578 EXPECT_TRUE(launcher_delegate_->IsPinned(id2));

579	579

580 UnpinAppsWithID("1");	580 UnpinAppsWithID("1");

581 ASSERT_EQ(initial_size + 1, launcher_model_->items().size());	581 ASSERT_EQ(initial_size + 1, launcher_model_->items().size());

582 ash::LauncherID id3 = launcher_model_->items()[initial_size].id;	582 ash::LauncherID id3 = launcher_model_->items()[initial_size].id;

583 EXPECT_EQ(id2, id3);	583 EXPECT_EQ(id2, id3);

584 }	584 }

OLD	NEW