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

Side by Side Diff: ash/shell.h

Issue 26373009: ash:Shelf - Added UMA stats for ShelfAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/shelf/shelf_view.cc ('k') | ash/shell.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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/periodic_metrics_recorder.h"
12 #include "ash/shelf/shelf_types.h" 13 #include "ash/shelf/shelf_types.h"
13 #include "ash/system/user/login_status.h" 14 #include "ash/system/user/login_status.h"
14 #include "ash/wm/system_modal_container_event_filter_delegate.h" 15 #include "ash/wm/system_modal_container_event_filter_delegate.h"
15 #include "base/basictypes.h" 16 #include "base/basictypes.h"
16 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
17 #include "base/gtest_prod_util.h" 18 #include "base/gtest_prod_util.h"
18 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
20 #include "base/observer_list.h" 21 #include "base/observer_list.h"
21 #include "ui/aura/client/activation_change_observer.h" 22 #include "ui/aura/client/activation_change_observer.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 // which case they are created on |target_root_window_|. 574 // which case they are created on |target_root_window_|.
574 // |target_root_window_| never becomes NULL during the session. 575 // |target_root_window_| never becomes NULL during the session.
575 aura::Window* target_root_window_; 576 aura::Window* target_root_window_;
576 aura::Window* scoped_target_root_window_; 577 aura::Window* scoped_target_root_window_;
577 578
578 // The CompoundEventFilter owned by aura::Env object. 579 // The CompoundEventFilter owned by aura::Env object.
579 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_; 580 scoped_ptr<views::corewm::CompoundEventFilter> env_filter_;
580 581
581 std::vector<WindowAndBoundsPair> to_restore_; 582 std::vector<WindowAndBoundsPair> to_restore_;
582 583
584 scoped_ptr<PeriodicMetricsRecorder> periodic_metrics_recorder_;
583 scoped_ptr<keyboard::KeyboardController> keyboard_controller_; 585 scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
584 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 586 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
585 scoped_ptr<AcceleratorController> accelerator_controller_; 587 scoped_ptr<AcceleratorController> accelerator_controller_;
586 scoped_ptr<ShellDelegate> delegate_; 588 scoped_ptr<ShellDelegate> delegate_;
587 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 589 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
588 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 590 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
589 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 591 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
590 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 592 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
591 scoped_ptr<SessionStateDelegate> session_state_delegate_; 593 scoped_ptr<SessionStateDelegate> session_state_delegate_;
592 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; 594 scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 bool simulate_modal_window_open_for_testing_; 693 bool simulate_modal_window_open_for_testing_;
692 694
693 bool is_touch_hud_projection_enabled_; 695 bool is_touch_hud_projection_enabled_;
694 696
695 DISALLOW_COPY_AND_ASSIGN(Shell); 697 DISALLOW_COPY_AND_ASSIGN(Shell);
696 }; 698 };
697 699
698 } // namespace ash 700 } // namespace ash
699 701
700 #endif // ASH_SHELL_H_ 702 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698