chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc - Issue 494033002: Move AppWindow to extensions

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/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

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

Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h ('k') | chrome/browser/extensions/api/app_window/app_window_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

index 36b63e902f8a8dfb6b16de7d5fc138b23cdc07ac..2f826d7182058362884beba3b9c417c482845177 100644

--- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

+++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

@@ -4,13 +4,13 @@

#include "chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h"

-#include "apps/app_window.h"

-#include "apps/app_window_registry.h"

#include "base/command_line.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/extensions/api/app_current_window_internal.h"

#include "chrome/common/extensions/api/app_window.h"

#include "chrome/common/extensions/features/feature_channel.h"

+#include "extensions/browser/app_window/app_window.h"

+#include "extensions/browser/app_window/app_window_registry.h"

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

#include "extensions/browser/app_window/size_constraints.h"

#include "extensions/common/features/simple_feature.h"

@@ -29,7 +29,6 @@ namespace SetBadgeIcon = app_current_window_internal::SetBadgeIcon;

namespace SetShape = app_current_window_internal::SetShape;

namespace SetAlwaysOnTop = app_current_window_internal::SetAlwaysOnTop;

-using apps::AppWindow;

using app_current_window_internal::Bounds;

using app_current_window_internal::Region;

using app_current_window_internal::RegionRect;

@@ -119,8 +118,7 @@ BoundsType GetBoundsType(const std::string& type_as_string) {

} // namespace bounds

bool AppCurrentWindowInternalExtensionFunction::RunSync() {

- apps::AppWindowRegistry* registry =

- apps::AppWindowRegistry::Get(GetProfile());

+ AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());

DCHECK(registry);

content::RenderViewHost* rvh = render_view_host();

if (!rvh)