chrome/browser/ui/webui/extensions/extension_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/extensions/extension_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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_extension.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

index 87f8a3f36844f54f833d0421a7037ae9a4f32f73..334420a2b8b4e30982171c95832e4c6d72417bcf 100644

--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

@@ -5,8 +5,6 @@

#include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"

#include "apps/app_load_service.h"

-#include "apps/app_window.h"

-#include "apps/app_window_registry.h"

#include "apps/saved_files_service.h"

#include "base/auto_reset.h"

#include "base/base64.h"

@@ -73,6 +71,8 @@

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

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

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

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

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

#include "extensions/browser/blacklist_state.h"

#include "extensions/browser/extension_error.h"

#include "extensions/browser/extension_host.h"

@@ -1364,15 +1364,15 @@ void ExtensionSettingsHandler::GetAppWindowPagesForExtensionProfile(

const Extension* extension,

Profile* profile,

std::vector<ExtensionPage>* result) {

- apps::AppWindowRegistry* registry = apps::AppWindowRegistry::Get(profile);

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

if (!registry) return;

- const apps::AppWindowRegistry::AppWindowList windows =

+ const AppWindowRegistry::AppWindowList windows =

registry->GetAppWindowsForApp(extension->id());

bool has_generated_background_page =

BackgroundInfo::HasGeneratedBackgroundPage(extension);

- for (apps::AppWindowRegistry::const_iterator it = windows.begin();

+ for (AppWindowRegistry::const_iterator it = windows.begin();

it != windows.end();

++it) {

WebContents* web_contents = (*it)->web_contents();