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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/shell_delegate_impl.cc ('k') | ash/shell_unittest.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/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_controller.h"
10 #include "ash/common/system/status_area_widget.h" 10 #include "ash/common/system/status_area_widget.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/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.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"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 params.can_resize = true; 262 params.can_resize = true;
263 params.can_maximize = true; 263 params.can_maximize = true;
264 ToplevelWindow::CreateToplevelWindow(params); 264 ToplevelWindow::CreateToplevelWindow(params);
265 } else if (sender == panel_button_) { 265 } else if (sender == panel_button_) {
266 PanelWindow::CreatePanelWindow(gfx::Rect()); 266 PanelWindow::CreatePanelWindow(gfx::Rect());
267 } else if (sender == create_nonresizable_button_) { 267 } else if (sender == create_nonresizable_button_) {
268 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams()); 268 ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams());
269 } else if (sender == bubble_button_) { 269 } else if (sender == bubble_button_) {
270 CreatePointyBubble(sender); 270 CreatePointyBubble(sender);
271 } else if (sender == lock_button_) { 271 } else if (sender == lock_button_) {
272 WmShell::Get()->GetSessionStateDelegate()->LockScreen(); 272 WmShell::Get()->session_controller()->LockScreen();
273 } else if (sender == widgets_button_) { 273 } else if (sender == widgets_button_) {
274 CreateWidgetsWindow(); 274 CreateWidgetsWindow();
275 } else if (sender == system_modal_button_) { 275 } else if (sender == system_modal_button_) {
276 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(), 276 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
277 ui::MODAL_TYPE_SYSTEM); 277 ui::MODAL_TYPE_SYSTEM);
278 } else if (sender == window_modal_button_) { 278 } else if (sender == window_modal_button_) {
279 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(), 279 ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
280 ui::MODAL_TYPE_WINDOW); 280 ui::MODAL_TYPE_WINDOW);
281 } else if (sender == child_modal_button_) { 281 } else if (sender == child_modal_button_) {
282 test::CreateChildModalParent(GetWidget()->GetNativeView()->GetRootWindow()); 282 test::CreateChildModalParent(GetWidget()->GetNativeView()->GetRootWindow());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 views::MenuRunner::ASYNC)); 336 views::MenuRunner::ASYNC));
337 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), 337 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
338 views::MENU_ANCHOR_TOPLEFT, 338 views::MENU_ANCHOR_TOPLEFT,
339 source_type) == MenuRunner::MENU_DELETED) { 339 source_type) == MenuRunner::MENU_DELETED) {
340 return; 340 return;
341 } 341 }
342 } 342 }
343 343
344 } // namespace shell 344 } // namespace shell
345 } // namespace ash 345 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698