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

Side by Side Diff: ash/shell/lock_view.cc

Issue 9310008: aura: Fix a couple of tooltip related bugs: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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
« no previous file with comments | « no previous file | ash/tooltips/tooltip_controller.cc » ('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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/shell_window_ids.h" 6 #include "ash/shell_window_ids.h"
7 #include "ash/shell/example_factory.h" 7 #include "ash/shell/example_factory.h"
8 #include "ash/tooltips/tooltip_controller.h"
8 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
9 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
10 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
11 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
12 #include "ui/gfx/font.h" 13 #include "ui/gfx/font.h"
13 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
14 #include "ui/views/widget/widget_delegate.h" 15 #include "ui/views/widget/widget_delegate.h"
15 16
16 using ash::Shell; 17 using ash::Shell;
17 18
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 (root_window_size.height() - ps.height()) / 2, 62 (root_window_size.height() - ps.height()) / 2,
62 ps.width(), ps.height()); 63 ps.width(), ps.height());
63 params.delegate = lock_view; 64 params.delegate = lock_view;
64 widget->Init(params); 65 widget->Init(params);
65 Shell::GetInstance()->GetContainer( 66 Shell::GetInstance()->GetContainer(
66 ash::internal::kShellWindowId_LockScreenContainer)-> 67 ash::internal::kShellWindowId_LockScreenContainer)->
67 AddChild(widget->GetNativeView()); 68 AddChild(widget->GetNativeView());
68 widget->SetContentsView(lock_view); 69 widget->SetContentsView(lock_view);
69 widget->Show(); 70 widget->Show();
70 widget->GetNativeView()->SetName("LockView"); 71 widget->GetNativeView()->SetName("LockView");
72
73 Shell::GetInstance()->tooltip_controller()->UpdateTooltip(
74 widget->GetNativeView());
71 } 75 }
72 76
73 } // namespace shell 77 } // namespace shell
74 } // namespace ash 78 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698