apps/shell/app_shell_browser_main_parts.cc - Issue 74183002: Introduce ui/wm/ directory.

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: apps/shell/app_shell_browser_main_parts.cc

Issue 74183002: Introduce ui/wm/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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: apps/shell/app_shell_browser_main_parts.cc

diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc

index 8a369df3b53aa26b28594e7b757be5b7d5cac717..5c9000d13ccddce313be5b7eddca99347a181d45 100644

--- a/apps/shell/app_shell_browser_main_parts.cc

+++ b/apps/shell/app_shell_browser_main_parts.cc

@@ -11,7 +11,7 @@

#include "ui/aura/env.h"

#include "ui/aura/root_window.h"

#include "ui/aura/test/test_screen.h"

-#include "ui/shell/minimal_shell.h"

+#include "ui/wm/test/minimal_shell.h"

namespace apps {

@@ -42,7 +42,7 @@ void AppShellBrowserMainParts::PreMainMessageLoopRun() {

gfx::Screen::SetScreenInstance(

gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());

// Set up basic pieces of views::corewm.

- minimal_shell_.reset(new shell::MinimalShell(gfx::Size(800, 600)));

+ minimal_shell_.reset(new wm::MinimalShell(gfx::Size(800, 600)));

// Ensure the X window gets mapped.

minimal_shell_->root_window()->host()->Show();