chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.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/views/app_list/win/app_list_controller_delegate_win.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/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc ('k') | chrome/browser/ui/views/apps/chrome_apps_client_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

diff --git a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

index 4b215172486cf137fa0fdd8e6ab9f6eab45edb80..743c4d1657df11c6cf8c45d02804d716aac9c6ea 100644

--- a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

+++ b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

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

#include "chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h"

-#include "apps/app_window.h"

-#include "apps/app_window_registry.h"

#include "chrome/browser/metro_utils/metro_chrome_win.h"

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

#include "chrome/browser/ui/app_list/app_list_icon_win.h"

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/browser/ui/host_desktop.h"

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

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

#include "ui/base/resource/resource_bundle.h"

AppListControllerDelegateWin::AppListControllerDelegateWin(

@@ -31,8 +31,8 @@ gfx::ImageSkia AppListControllerDelegateWin::GetWindowIcon() {

void AppListControllerDelegateWin::FillLaunchParams(AppLaunchParams* params) {

params->desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;

- apps::AppWindow* any_existing_window =

- apps::AppWindowRegistry::Get(params->profile)

+ extensions::AppWindow* any_existing_window =

+ extensions::AppWindowRegistry::Get(params->profile)

->GetCurrentAppWindowForApp(params->extension_id);

if (any_existing_window &&

chrome::GetHostDesktopTypeForNativeWindow(