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

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 217533006: Introduce apps API target in //apps and move app.runtime API into it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix dependencies (app-runtime-move) Created 6 years, 8 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
OLDNEW
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 "apps/app_window.h" 5 #include "apps/app_window.h"
6 #include "apps/app_window_registry.h" 6 #include "apps/app_window_registry.h"
7 #include "apps/common/api/app_runtime.h"
7 #include "apps/launcher.h" 8 #include "apps/launcher.h"
8 #include "apps/ui/native_app_window.h" 9 #include "apps/ui/native_app_window.h"
9 #include "base/bind.h" 10 #include "base/bind.h"
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/file_util.h" 12 #include "base/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
13 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
14 #include "base/stl_util.h" 15 #include "base/stl_util.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/browser/apps/app_browsertest_util.h" 18 #include "chrome/browser/apps/app_browsertest_util.h"
18 #include "chrome/browser/automation/automation_util.h" 19 #include "chrome/browser/automation/automation_util.h"
19 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
20 #include "chrome/browser/devtools/devtools_window.h" 21 #include "chrome/browser/devtools/devtools_window.h"
21 #include "chrome/browser/extensions/api/permissions/permissions_api.h" 22 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
22 #include "chrome/browser/extensions/component_loader.h" 23 #include "chrome/browser/extensions/component_loader.h"
23 #include "chrome/browser/extensions/extension_browsertest.h" 24 #include "chrome/browser/extensions/extension_browsertest.h"
24 #include "chrome/browser/extensions/extension_service.h" 25 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/extensions/extension_test_message_listener.h" 26 #include "chrome/browser/extensions/extension_test_message_listener.h"
26 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 27 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
27 #include "chrome/browser/ui/browser.h" 28 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/extensions/application_launch.h" 29 #include "chrome/browser/ui/extensions/application_launch.h"
29 #include "chrome/browser/ui/tabs/tab_strip_model.h" 30 #include "chrome/browser/ui/tabs/tab_strip_model.h"
30 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" 31 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
31 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/extensions/api/app_runtime.h"
33 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
34 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
35 #include "chrome/test/base/test_switches.h" 35 #include "chrome/test/base/test_switches.h"
36 #include "chrome/test/base/ui_test_utils.h" 36 #include "chrome/test/base/ui_test_utils.h"
37 #include "components/user_prefs/pref_registry_syncable.h" 37 #include "components/user_prefs/pref_registry_syncable.h"
38 #include "components/web_modal/web_contents_modal_dialog_manager.h" 38 #include "components/web_modal/web_contents_modal_dialog_manager.h"
39 #include "content/public/browser/devtools_agent_host.h" 39 #include "content/public/browser/devtools_agent_host.h"
40 #include "content/public/browser/render_process_host.h" 40 #include "content/public/browser/render_process_host.h"
41 #include "content/public/browser/render_widget_host_view.h" 41 #include "content/public/browser/render_widget_host_view.h"
42 #include "content/public/browser/web_contents_view.h" 42 #include "content/public/browser/web_contents_view.h"
(...skipping 11 matching lines...) Expand all
54 #include "chromeos/dbus/dbus_thread_manager.h" 54 #include "chromeos/dbus/dbus_thread_manager.h"
55 #include "chromeos/dbus/fake_dbus_thread_manager.h" 55 #include "chromeos/dbus/fake_dbus_thread_manager.h"
56 #include "chromeos/dbus/fake_power_manager_client.h" 56 #include "chromeos/dbus/fake_power_manager_client.h"
57 #endif 57 #endif
58 58
59 using apps::AppWindow; 59 using apps::AppWindow;
60 using apps::AppWindowRegistry; 60 using apps::AppWindowRegistry;
61 using content::WebContents; 61 using content::WebContents;
62 using web_modal::WebContentsModalDialogManager; 62 using web_modal::WebContentsModalDialogManager;
63 63
64 namespace app_runtime = apps::api::app_runtime;
65
64 namespace extensions { 66 namespace extensions {
65 67
66 namespace app_runtime = api::app_runtime;
67
68 namespace { 68 namespace {
69 69
70 // Non-abstract RenderViewContextMenu class. 70 // Non-abstract RenderViewContextMenu class.
71 class PlatformAppContextMenu : public RenderViewContextMenu { 71 class PlatformAppContextMenu : public RenderViewContextMenu {
72 public: 72 public:
73 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, 73 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host,
74 const content::ContextMenuParams& params) 74 const content::ContextMenuParams& params)
75 : RenderViewContextMenu(render_frame_host, params) {} 75 : RenderViewContextMenu(render_frame_host, params) {}
76 76
77 bool HasCommandWithId(int command_id) { 77 bool HasCommandWithId(int command_id) {
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 1319
1320 ExtensionApiTest::ResultCatcher result_catcher; 1320 ExtensionApiTest::ResultCatcher result_catcher;
1321 1321
1322 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); 1322 ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
1323 1323
1324 EXPECT_TRUE(result_catcher.GetNextResult()); 1324 EXPECT_TRUE(result_catcher.GetNextResult());
1325 } 1325 }
1326 } 1326 }
1327 1327
1328 } // namespace extensions 1328 } // namespace extensions
OLDNEW
« no previous file with comments | « apps/shell/common/shell_extensions_client.cc ('k') | chrome/browser/apps/app_launch_for_metro_restart_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698