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

Side by Side Diff: ash/shell.h

Issue 10514008: Add WebNotificationTray (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test (don't mirror bubble arrow) Created 8 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 | Annotate | Revision Log
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 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 class Launcher; 65 class Launcher;
66 class NestedDispatcherController; 66 class NestedDispatcherController;
67 class PowerButtonController; 67 class PowerButtonController;
68 class ScreenAsh; 68 class ScreenAsh;
69 class ShellDelegate; 69 class ShellDelegate;
70 class ShellObserver; 70 class ShellObserver;
71 class SystemTrayDelegate; 71 class SystemTrayDelegate;
72 class SystemTray; 72 class SystemTray;
73 class UserWallpaperDelegate; 73 class UserWallpaperDelegate;
74 class VideoDetector; 74 class VideoDetector;
75 class WebNotificationTray;
75 class WindowCycleController; 76 class WindowCycleController;
76 77
77 namespace internal { 78 namespace internal {
78 class AcceleratorFilter; 79 class AcceleratorFilter;
79 class ActivationController; 80 class ActivationController;
80 class AppListController; 81 class AppListController;
81 class DragDropController; 82 class DragDropController;
82 class EventClientImpl; 83 class EventClientImpl;
83 class FocusCycler; 84 class FocusCycler;
84 class KeyRewriterEventFilter; 85 class KeyRewriterEventFilter;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 293
293 // TODO(sky): don't expose this! 294 // TODO(sky): don't expose this!
294 internal::ShelfLayoutManager* shelf() const { return shelf_; } 295 internal::ShelfLayoutManager* shelf() const { return shelf_; }
295 296
296 internal::StatusAreaWidget* status_area_widget() const { 297 internal::StatusAreaWidget* status_area_widget() const {
297 return status_area_widget_; 298 return status_area_widget_;
298 } 299 }
299 300
300 SystemTray* system_tray() const { return system_tray_.get(); } 301 SystemTray* system_tray() const { return system_tray_.get(); }
301 302
303 WebNotificationTray* web_notification_tray() const {
304 return web_notification_tray_.get();
305 }
306
302 // Returns the size of the grid. 307 // Returns the size of the grid.
303 int GetGridSize() const; 308 int GetGridSize() const;
304 309
305 // Returns true if in maximized or fullscreen mode. 310 // Returns true if in maximized or fullscreen mode.
306 bool IsInMaximizedMode() const; 311 bool IsInMaximizedMode() const;
307 312
308 static void set_initially_hide_cursor(bool hide) { 313 static void set_initially_hide_cursor(bool hide) {
309 initially_hide_cursor_ = hide; 314 initially_hide_cursor_ = hide;
310 } 315 }
311 316
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 455
451 // Owned by aura::RootWindow, cached here for type safety. 456 // Owned by aura::RootWindow, cached here for type safety.
452 internal::RootWindowLayoutManager* root_window_layout_; 457 internal::RootWindowLayoutManager* root_window_layout_;
453 458
454 // Widget containing system tray. 459 // Widget containing system tray.
455 internal::StatusAreaWidget* status_area_widget_; 460 internal::StatusAreaWidget* status_area_widget_;
456 461
457 // System tray with clock, Wi-Fi signal, etc. 462 // System tray with clock, Wi-Fi signal, etc.
458 scoped_ptr<SystemTray> system_tray_; 463 scoped_ptr<SystemTray> system_tray_;
459 464
465 // Tray for web notifications.
466 scoped_ptr<WebNotificationTray> web_notification_tray_;
467
460 // Used by ash/shell. 468 // Used by ash/shell.
461 content::BrowserContext* browser_context_; 469 content::BrowserContext* browser_context_;
462 470
463 DISALLOW_COPY_AND_ASSIGN(Shell); 471 DISALLOW_COPY_AND_ASSIGN(Shell);
464 }; 472 };
465 473
466 } // namespace ash 474 } // namespace ash
467 475
468 #endif // ASH_SHELL_H_ 476 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/shell.cc » ('j') | ash/system/tray/system_tray_bubble.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698