chrome/browser/ui/webui/options/website_settings_handler.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/ui/webui/options/website_settings_handler.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:

Index: chrome/browser/ui/webui/options/website_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/website_settings_handler.cc b/chrome/browser/ui/webui/options/website_settings_handler.cc

index 2208435fcca672f751886b71a0253f4df89ac080..a31bbb1e8ad6ed64e4f921974001596fb772261a 100644

--- a/chrome/browser/ui/webui/options/website_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/website_settings_handler.cc

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

#include "chrome/browser/ui/webui/options/website_settings_handler.h"

-#include "apps/app_window_registry.h"

#include "chrome/browser/content_settings/content_settings_utils.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/extensions/extension_service.h"

@@ -19,6 +18,7 @@

#include "content/public/browser/storage_partition.h"

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

#include "content/public/browser/web_ui.h"

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

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/common/constants.h"

@@ -537,7 +537,7 @@ void WebsiteSettingsHandler::StopOrigin(const GURL& site_url) {

->enabled_extensions()

.GetHostedAppByURL(site_url);

if (extension) {

- apps::AppWindowRegistry::Get(profile)

+ extensions::AppWindowRegistry::Get(profile)

->CloseAllAppWindowsForApp(extension->id());

}

« no previous file with comments | « chrome/browser/ui/webui/options/options_handlers_helper.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »