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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.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/app_list/extension_app_item.cc ('k') | chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.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 "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"	5 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.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/ash/launcher/chrome_launcher_controller.h"

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

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

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

15 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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/public/test/test_browser_thread.h"	18 #include "content/public/test/test_browser_thread.h"

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

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

	21 #include "ui/aura/client/activation_delegate.h"

21 #include "ui/aura/client/aura_constants.h"	22 #include "ui/aura/client/aura_constants.h"

22 #include "ui/aura/client/activation_delegate.h"

23 #include "ui/aura/root_window.h"	23 #include "ui/aura/root_window.h"

24 #include "ui/aura/test/test_activation_client.h"	24 #include "ui/aura/test/test_activation_client.h"

25 #include "ui/aura/test/test_window_delegate.h"	25 #include "ui/aura/test/test_window_delegate.h"

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

27 #include "ui/aura/window_delegate.h"	27 #include "ui/aura/window_delegate.h"

28 #include "ui/base/event.h"	28 #include "ui/base/event.h"

29	29

30 namespace {	30 namespace {

31	31

32 // Test implementation of AppTabHelper	32 // Test implementation of AppTabHelper

(...skipping 370 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
403 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);	403 EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);

404	404

405 // App window should go to attention state.	405 // App window should go to attention state.

406 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);	406 app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);

407 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);	407 EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);

408	408

409 // Activating app window should clear attention state.	409 // Activating app window should clear attention state.

410 activation_client_->ActivateWindow(&app_state.window);	410 activation_client_->ActivateWindow(&app_state.window);

411 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);	411 EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);

412 }	412 }

OLD	NEW