chrome/browser/ui/views/apps/chrome_native_app_window_views_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/apps/chrome_native_app_window_views_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/views/apps/chrome_native_app_window_views_win.h ('k') | chrome/browser/ui/views/select_file_dialog_extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

index 6da554d2de37924d4b3b89aa9f554f27af3a35de..cdde4343622ddc741973dbdaf679e047e6641d8b 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

@@ -4,8 +4,6 @@

#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h"

-#include "apps/app_window.h"

-#include "apps/app_window_registry.h"

#include "apps/ui/views/app_window_frame_view.h"

#include "ash/shell.h"

#include "base/command_line.h"

@@ -27,6 +25,8 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/grit/generated_resources.h"

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

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

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

#include "extensions/browser/extension_util.h"

#include "extensions/common/extension.h"

#include "ui/aura/remote_window_tree_host_win.h"

@@ -80,8 +80,8 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(

std::string extension_id = app_window()->extension_id();

// If an app has any existing windows, ensure new ones are created on the

// same desktop.

- apps::AppWindow* any_existing_window =

- apps::AppWindowRegistry::Get(browser_context)

+ extensions::AppWindow* any_existing_window =

+ extensions::AppWindowRegistry::Get(browser_context)

->GetCurrentAppWindowForApp(extension_id);

chrome::HostDesktopType desktop_type;

if (any_existing_window) {

@@ -105,7 +105,7 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(

}

void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(

- const apps::AppWindow::CreateParams& create_params) {

+ const extensions::AppWindow::CreateParams& create_params) {

ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);

const extensions::Extension* extension = app_window()->GetExtension();