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: chrome/browser/ui/views/ash/chrome_shell_delegate.h

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | 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 CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 23 matching lines...) Expand all
34 return status_area_host_.get(); 34 return status_area_host_.get();
35 } 35 }
36 36
37 StatusAreaView* GetStatusArea(); 37 StatusAreaView* GetStatusArea();
38 38
39 WindowPositioner* window_positioner() { return window_positioner_.get(); } 39 WindowPositioner* window_positioner() { return window_positioner_.get(); }
40 40
41 // ash::ShellDelegate overrides; 41 // ash::ShellDelegate overrides;
42 virtual views::Widget* CreateStatusArea() OVERRIDE; 42 virtual views::Widget* CreateStatusArea() OVERRIDE;
43 virtual bool CanCreateLauncher() OVERRIDE; 43 virtual bool CanCreateLauncher() OVERRIDE;
44 #if defined(OS_CHROMEOS)
45 virtual void LockScreen() OVERRIDE; 44 virtual void LockScreen() OVERRIDE;
46 #endif 45 virtual void UnlockScreen() OVERRIDE;
46 virtual bool IsScreenLocked() const OVERRIDE;
47 virtual void Exit() OVERRIDE; 47 virtual void Exit() OVERRIDE;
48 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 48 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
49 virtual std::vector<aura::Window*> GetCycleWindowList( 49 virtual std::vector<aura::Window*> GetCycleWindowList(
50 CycleSource source) const OVERRIDE; 50 CycleSource source) const OVERRIDE;
51 virtual void StartPartialScreenshot( 51 virtual void StartPartialScreenshot(
52 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE; 52 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
53 virtual ash::LauncherDelegate* CreateLauncherDelegate( 53 virtual ash::LauncherDelegate* CreateLauncherDelegate(
54 ash::LauncherModel* model) OVERRIDE; 54 ash::LauncherModel* model) OVERRIDE;
55 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 55 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
56 ash::SystemTray* tray) OVERRIDE; 56 ash::SystemTray* tray) OVERRIDE;
57 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 57 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
58 58
59 // content::NotificationObserver override: 59 // content::NotificationObserver override:
60 virtual void Observe(int type, 60 virtual void Observe(int type,
61 const content::NotificationSource& source, 61 const content::NotificationSource& source,
62 const content::NotificationDetails& details) OVERRIDE; 62 const content::NotificationDetails& details) OVERRIDE;
63 63
64 private: 64 private:
65 static ChromeShellDelegate* instance_; 65 static ChromeShellDelegate* instance_;
66 66
67 content::NotificationRegistrar registrar_; 67 content::NotificationRegistrar registrar_;
68 68
69 scoped_ptr<StatusAreaHostAura> status_area_host_; 69 scoped_ptr<StatusAreaHostAura> status_area_host_;
70 scoped_ptr<WindowPositioner> window_positioner_; 70 scoped_ptr<WindowPositioner> window_positioner_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 72 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
73 }; 73 };
74 74
75 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_ 75 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698