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

Side by Side Diff: ui/aura_shell/examples/lock_view.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura_shell/examples/bubble.cc ('k') | ui/aura_shell/examples/toplevel_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "ui/aura/desktop.h" 6 #include "ui/aura/desktop.h"
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/aura_shell/examples/example_factory.h" 8 #include "ui/aura_shell/examples/example_factory.h"
9 #include "ui/aura_shell/shell.h" 9 #include "ui/aura_shell/shell.h"
10 #include "ui/aura_shell/shell_window_ids.h" 10 #include "ui/aura_shell/shell_window_ids.h"
11 #include "ui/gfx/canvas.h" 11 #include "ui/gfx/canvas.h"
12 #include "ui/gfx/font.h" 12 #include "ui/gfx/font.h"
13 #include "views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 #include "views/widget/widget_delegate.h" 14 #include "ui/views/widget/widget_delegate.h"
15 15
16 namespace aura_shell { 16 namespace aura_shell {
17 namespace examples { 17 namespace examples {
18 18
19 class LockView : public views::WidgetDelegateView { 19 class LockView : public views::WidgetDelegateView {
20 public: 20 public:
21 LockView() {} 21 LockView() {}
22 virtual ~LockView() {} 22 virtual ~LockView() {}
23 23
24 // Overridden from View: 24 // Overridden from View:
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 Shell::GetInstance()->GetContainer( 63 Shell::GetInstance()->GetContainer(
64 aura_shell::internal::kShellWindowId_LockScreenContainer)-> 64 aura_shell::internal::kShellWindowId_LockScreenContainer)->
65 AddChild(widget->GetNativeView()); 65 AddChild(widget->GetNativeView());
66 widget->SetContentsView(lock_view); 66 widget->SetContentsView(lock_view);
67 widget->Show(); 67 widget->Show();
68 widget->GetNativeView()->set_name("LockView"); 68 widget->GetNativeView()->set_name("LockView");
69 } 69 }
70 70
71 } // namespace examples 71 } // namespace examples
72 } // namespace aura_shell 72 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/examples/bubble.cc ('k') | ui/aura_shell/examples/toplevel_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698