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

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

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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
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/shell/window_type_launcher.h" 5 #include "ash/shell/window_type_launcher.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/system/web_notification/web_notification_tray.h" 11 #include "ash/common/system/web_notification/web_notification_tray.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/content/shell_content_state.h" 13 #include "ash/content/shell_content_state.h"
14 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
15 #include "ash/shelf/shelf_widget.h" 15 #include "ash/shelf/shelf_widget.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/shell/example_factory.h" 17 #include "ash/shell/example_factory.h"
18 #include "ash/shell/panel_window.h" 18 #include "ash/shell/panel_window.h"
19 #include "ash/shell/toplevel_window.h" 19 #include "ash/shell/toplevel_window.h"
20 #include "ash/shell_delegate.h"
21 #include "ash/system/status_area_widget.h" 20 #include "ash/system/status_area_widget.h"
22 #include "ash/test/child_modal_window.h" 21 #include "ash/test/child_modal_window.h"
23 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
24 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
25 #include "ui/aura/window_event_dispatcher.h" 24 #include "ui/aura/window_event_dispatcher.h"
26 #include "ui/compositor/layer.h" 25 #include "ui/compositor/layer.h"
27 #include "ui/gfx/canvas.h" 26 #include "ui/gfx/canvas.h"
28 #include "ui/message_center/message_center.h" 27 #include "ui/message_center/message_center.h"
29 #include "ui/message_center/notification_types.h" 28 #include "ui/message_center/notification_types.h"
30 #include "ui/views/controls/button/label_button.h" 29 #include "ui/views/controls/button/label_button.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 views::MenuRunner::ASYNC)); 359 views::MenuRunner::ASYNC));
361 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), 360 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
362 views::MENU_ANCHOR_TOPLEFT, 361 views::MENU_ANCHOR_TOPLEFT,
363 source_type) == MenuRunner::MENU_DELETED) { 362 source_type) == MenuRunner::MENU_DELETED) {
364 return; 363 return;
365 } 364 }
366 } 365 }
367 366
368 } // namespace shell 367 } // namespace shell
369 } // namespace ash 368 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698