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

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

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 years, 7 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 | « 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 "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/screensaver/screensaver_view.h" 8 #include "ash/screensaver/screensaver_view.h"
9 #include "ash/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell/example_factory.h" 12 #include "ash/shell/example_factory.h"
13 #include "ash/shell/panel_window.h" 13 #include "ash/shell/panel_window.h"
14 #include "ash/shell/toplevel_window.h" 14 #include "ash/shell/toplevel_window.h"
15 #include "ash/shell_delegate.h" 15 #include "ash/shell_delegate.h"
16 #include "ash/shell_window_ids.h" 16 #include "ash/shell_window_ids.h"
17 #include "ash/system/status_area_widget.h" 17 #include "ash/system/status_area_widget.h"
18 #include "ash/system/web_notification/web_notification_tray.h" 18 #include "ash/system/web_notification/web_notification_tray.h"
19 #include "base/bind.h" 19 #include "base/bind.h"
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 gfx::Rect(point, gfx::Size()), 391 gfx::Rect(point, gfx::Size()),
392 MenuItemView::TOPLEFT, 392 MenuItemView::TOPLEFT,
393 source_type, 393 source_type,
394 MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) == 394 MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
395 MenuRunner::MENU_DELETED) 395 MenuRunner::MENU_DELETED)
396 return; 396 return;
397 } 397 }
398 398
399 } // namespace shell 399 } // namespace shell
400 } // namespace ash 400 } // 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