Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

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: rm owners file so i can land this 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/app_shell_browser_main_parts.h ('k') | content/content_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « apps/shell/app_shell_browser_main_parts.h ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698