Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

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

Issue 10544023: Moving the tabs_module API into a separate directory in api/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Correcting the order of includes. Created 8 years, 6 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
OLDNEW
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 "ash/launcher/launcher.h" 5 #include "ash/launcher/launcher.h"
6 #include "ash/launcher/launcher_model.h" 6 #include "ash/launcher/launcher_model.h"
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/automation/automation_util.h" 11 #include "chrome/browser/automation/automation_util.h"
12 #include "chrome/browser/extensions/extension_apitest.h" 12 #include "chrome/browser/extensions/extension_apitest.h"
13 #include "chrome/browser/extensions/extension_browsertest.h" 13 #include "chrome/browser/extensions/extension_browsertest.h"
14 #include "chrome/browser/extensions/extension_function_test_utils.h" 14 #include "chrome/browser/extensions/extension_function_test_utils.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_tabs_module.h"
17 #include "chrome/browser/extensions/extension_test_message_listener.h" 16 #include "chrome/browser/extensions/extension_test_message_listener.h"
18 #include "chrome/browser/extensions/platform_app_browsertest_util.h" 17 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
19 #include "chrome/browser/extensions/shell_window_registry.h" 18 #include "chrome/browser/extensions/shell_window_registry.h"
20 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/tab_contents/render_view_context_menu.h" 20 #include "chrome/browser/tab_contents/render_view_context_menu.h"
22 #include "chrome/browser/ui/browser.h" 21 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_list.h" 22 #include "chrome/browser/ui/browser_list.h"
24 #include "chrome/browser/ui/extensions/application_launch.h" 23 #include "chrome/browser/ui/extensions/application_launch.h"
25 #include "chrome/browser/ui/extensions/shell_window.h" 24 #include "chrome/browser/ui/extensions/shell_window.h"
26 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" 25 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ASSERT_EQ(item_count, launcher->model()->item_count()); 116 ASSERT_EQ(item_count, launcher->model()->item_count());
118 item = *launcher->model()->ItemByID(item_id); 117 item = *launcher->model()->ItemByID(item_id);
119 ASSERT_EQ(ash::STATUS_RUNNING, item.status); 118 ASSERT_EQ(ash::STATUS_RUNNING, item.status);
120 119
121 // Close first window. 120 // Close first window.
122 CloseShellWindow(window1); 121 CloseShellWindow(window1);
123 // Confirm item is removed. 122 // Confirm item is removed.
124 --item_count; 123 --item_count;
125 ASSERT_EQ(item_count, launcher->model()->item_count()); 124 ASSERT_EQ(item_count, launcher->model()->item_count());
126 } 125 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.cc ('k') | chrome/browser/ui/views/ash/panel_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698