chrome/browser/apps/app_browsertest.cc - Issue 217533006: Introduce apps API target in //apps and move app.runtime API into it

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

Unified 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, 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:

Index: chrome/browser/apps/app_browsertest.cc

diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc

index 10c6636c61244a0cdc62a2472e5ef52bdf1b14af..da15e6f81c5a31d648473957ad2fffdca121ee29 100644

--- a/chrome/browser/apps/app_browsertest.cc

+++ b/chrome/browser/apps/app_browsertest.cc

@@ -4,6 +4,7 @@

#include "apps/app_window.h"

#include "apps/app_window_registry.h"

+#include "apps/common/api/app_runtime.h"

#include "apps/launcher.h"

#include "apps/ui/native_app_window.h"

#include "base/bind.h"

@@ -29,7 +30,6 @@

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

#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/extensions/api/app_runtime.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/test/base/test_switches.h"

@@ -61,9 +61,9 @@ using apps::AppWindowRegistry;

using content::WebContents;

using web_modal::WebContentsModalDialogManager;

-namespace extensions {

+namespace app_runtime = apps::api::app_runtime;

-namespace app_runtime = api::app_runtime;

+namespace extensions {

namespace {