chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 479933003: Move NativeAppWindow to extensions

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

Issue 479933003: Move NativeAppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"	5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

6	6

7 #include "apps/app_window.h"	7 #include "apps/app_window.h"

8 #include "apps/app_window_registry.h"	8 #include "apps/app_window_registry.h"

9 #include "apps/ui/native_app_window.h"

10 #include "ash/ash_switches.h"	9 #include "ash/ash_switches.h"

11 #include "ash/display/display_controller.h"	10 #include "ash/display/display_controller.h"

12 #include "ash/shelf/shelf.h"	11 #include "ash/shelf/shelf.h"

13 #include "ash/shelf/shelf_button.h"	12 #include "ash/shelf/shelf_button.h"

14 #include "ash/shelf/shelf_constants.h"	13 #include "ash/shelf/shelf_constants.h"

15 #include "ash/shelf/shelf_model.h"	14 #include "ash/shelf/shelf_model.h"

16 #include "ash/shelf/shelf_util.h"	15 #include "ash/shelf/shelf_util.h"

17 #include "ash/shelf/shelf_view.h"	16 #include "ash/shelf/shelf_view.h"

18 #include "ash/shell.h"	17 #include "ash/shell.h"

19 #include "ash/test/app_list_controller_test_api.h"	18 #include "ash/test/app_list_controller_test_api.h"

(...skipping 25 matching lines...) Expand all Loading...
45 #include "chrome/browser/ui/extensions/application_launch.h"	44 #include "chrome/browser/ui/extensions/application_launch.h"

46 #include "chrome/browser/ui/host_desktop.h"	45 #include "chrome/browser/ui/host_desktop.h"

47 #include "chrome/browser/ui/settings_window_manager.h"	46 #include "chrome/browser/ui/settings_window_manager.h"

48 #include "chrome/browser/ui/tabs/tab_strip_model.h"	47 #include "chrome/browser/ui/tabs/tab_strip_model.h"

49 #include "chrome/common/chrome_switches.h"	48 #include "chrome/common/chrome_switches.h"

50 #include "chrome/test/base/ui_test_utils.h"	49 #include "chrome/test/base/ui_test_utils.h"

51 #include "content/public/browser/notification_service.h"	50 #include "content/public/browser/notification_service.h"

52 #include "content/public/browser/notification_source.h"	51 #include "content/public/browser/notification_source.h"

53 #include "content/public/browser/web_contents.h"	52 #include "content/public/browser/web_contents.h"

54 #include "content/public/test/browser_test_utils.h"	53 #include "content/public/test/browser_test_utils.h"

	54 #include "extensions/browser/app_window/native_app_window.h"

55 #include "extensions/browser/extension_system.h"	55 #include "extensions/browser/extension_system.h"

56 #include "extensions/common/constants.h"	56 #include "extensions/common/constants.h"

57 #include "extensions/common/switches.h"	57 #include "extensions/common/switches.h"

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

59 #include "ui/app_list/views/apps_grid_view.h"	59 #include "ui/app_list/views/apps_grid_view.h"

60 #include "ui/aura/client/aura_constants.h"	60 #include "ui/aura/client/aura_constants.h"

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

62 #include "ui/events/event.h"	62 #include "ui/events/event.h"

63 #include "ui/events/test/event_generator.h"	63 #include "ui/events/test/event_generator.h"

64	64

(...skipping 2060 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2125 chrome::GetSettingsUrl(std::string()));	2125 chrome::GetSettingsUrl(std::string()));

2126 Browser* settings_browser =	2126 Browser* settings_browser =

2127 settings_manager->FindBrowserForProfile(browser()->profile());	2127 settings_manager->FindBrowserForProfile(browser()->profile());

2128 ASSERT_TRUE(settings_browser);	2128 ASSERT_TRUE(settings_browser);

2129 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));	2129 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));

2130 EXPECT_EQ(item_count + 1, shelf_model->item_count());	2130 EXPECT_EQ(item_count + 1, shelf_model->item_count());

2131	2131

2132 // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.	2132 // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.

2133 // crbug.com/230464.	2133 // crbug.com/230464.

2134 }	2134 }

OLD	NEW