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

Side by Side Diff: ui/aura_shell/launcher/launcher_view.cc

Issue 7970001: Better Z-index support. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura_shell/launcher/launcher_view.h" 5 #include "ui/aura_shell/launcher/launcher_view.h"
6 6
7 #include "ui/aura/desktop.h" 7 #include "ui/aura/desktop.h"
8 #include "ui/aura_shell/aura_shell_export.h" 8 #include "ui/aura_shell/aura_shell_export.h"
9 #include "ui/aura_shell/launcher/launcher_button.h" 9 #include "ui/aura_shell/launcher/launcher_button.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 26 matching lines...) Expand all
37 AURA_SHELL_EXPORT views::Widget* CreateLauncher() { 37 AURA_SHELL_EXPORT views::Widget* CreateLauncher() {
38 views::Widget* launcher_widget = new views::Widget; 38 views::Widget* launcher_widget = new views::Widget;
39 views::Widget::InitParams params2(views::Widget::InitParams::TYPE_CONTROL); 39 views::Widget::InitParams params2(views::Widget::InitParams::TYPE_CONTROL);
40 params2.bounds = gfx::Rect(0, 0, 300, 64); 40 params2.bounds = gfx::Rect(0, 0, 300, 64);
41 params2.parent = aura::Desktop::GetInstance()->window(); 41 params2.parent = aura::Desktop::GetInstance()->window();
42 LauncherView* launcher_view = new LauncherView; 42 LauncherView* launcher_view = new LauncherView;
43 params2.delegate = launcher_view; 43 params2.delegate = launcher_view;
44 launcher_widget->Init(params2); 44 launcher_widget->Init(params2);
45 launcher_widget->SetContentsView(launcher_view); 45 launcher_widget->SetContentsView(launcher_view);
46 launcher_widget->Show(); 46 launcher_widget->Show();
47 launcher_widget->GetNativeView()->set_name(L"LauncherView");
47 return launcher_widget; 48 return launcher_widget;
48 } 49 }
49 50
50 } // namespace internal 51 } // namespace internal
51 } // namespace aura_shell 52 } // namespace aura_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698