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

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

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge Created 4 years, 6 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
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/common/shell_window_ids.h"
5 #include "ash/session/session_state_delegate.h" 6 #include "ash/session/session_state_delegate.h"
6 #include "ash/shell.h" 7 #include "ash/shell.h"
7 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
8 #include "ash/shell_window_ids.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/aura/window_event_dispatcher.h" 11 #include "ui/aura/window_event_dispatcher.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/font_list.h" 13 #include "ui/gfx/font_list.h"
14 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/text_utils.h" 15 #include "ui/gfx/text_utils.h"
16 #include "ui/views/controls/button/label_button.h" 16 #include "ui/views/controls/button/label_button.h"
17 #include "ui/views/corewm/tooltip_controller.h" 17 #include "ui/views/corewm/tooltip_controller.h"
18 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 widget->GetNativeView()->SetName("LockView"); 98 widget->GetNativeView()->SetName("LockView");
99 widget->GetNativeView()->Focus(); 99 widget->GetNativeView()->Focus();
100 100
101 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. 101 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here.
102 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( 102 Shell::GetInstance()->tooltip_controller()->UpdateTooltip(
103 widget->GetNativeView()); 103 widget->GetNativeView());
104 } 104 }
105 105
106 } // namespace shell 106 } // namespace shell
107 } // namespace ash 107 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698