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

Unified Diff: ui/aura_shell/aura_shell_main.cc

Issue 7890054: Adds code for a new Aura shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | « ui/aura_shell/aura_shell.gyp ('k') | ui/aura_shell/desktop_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/aura_shell_main.cc
===================================================================
--- ui/aura_shell/aura_shell_main.cc (revision 101422)
+++ ui/aura_shell/aura_shell_main.cc (working copy)
@@ -7,23 +7,26 @@
#include "base/i18n/icu_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/aura/desktop.h"
-#include "ui/aura/desktop_host.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
+#include "ui/aura_shell/desktop_layout_manager.h"
+#include "ui/aura_shell/shell_factory.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/rect.h"
-#include "views/widget/widget.h"
-#include "views/widget/widget_delegate.h"
-#if !defined(OS_WIN)
-#include "ui/aura/hit_test.h"
-#endif
+namespace {
+void InitDesktopWindow() {
+ aura::Window* desktop_window = aura::Desktop::GetInstance()->window();
+ DesktopLayoutManager* desktop_layout =
+ new DesktopLayoutManager(desktop_window);
+ desktop_window->SetLayoutManager(desktop_layout);
+
+ desktop_layout->set_background_widget(CreateDesktopBackground());
+ desktop_layout->set_launcher_widget(CreateLauncher());
+}
+
+}
+
int main(int argc, char** argv) {
CommandLine::Init(argc, argv);
@@ -41,6 +44,8 @@
// Create the message-loop here before creating the desktop.
MessageLoop message_loop(MessageLoop::TYPE_UI);
+ InitDesktopWindow();
+
aura::Desktop::GetInstance()->Run();
delete aura::Desktop::GetInstance();
« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | ui/aura_shell/desktop_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698