chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc - Issue 166573005: Rename apps::ShellWindow to apps::AppWindow

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 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, nits (rename) Created 6 years, 10 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/gtk/apps/native_app_window_gtk.cc ('k') | chrome/browser/ui/views/apps/chrome_shell_window_delegate_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 1094b8d637e362e66c47f4cb4df650c5cc2f7cb2..38cb76faf9422d9514fd65c3eaa8a8e63c32ae64 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,8 +4,8 @@

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

-#include "apps/shell_window.h"

-#include "apps/shell_window_registry.h"

+#include "apps/app_window.h"

+#include "apps/app_window_registry.h"

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

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

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

@@ -49,9 +49,9 @@ bool AppListControllerDelegateWin::CanDoCreateShortcutsFlow() {

void AppListControllerDelegateWin::FillLaunchParams(AppLaunchParams* params) {

params->desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;

- apps::ShellWindow* any_existing_window =

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

- GetCurrentShellWindowForApp(params->extension_id);

+ apps::AppWindow* any_existing_window =

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

+ ->GetCurrentAppWindowForApp(params->extension_id);

if (any_existing_window &&

chrome::GetHostDesktopTypeForNativeWindow(

any_existing_window->GetNativeWindow())