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

Side by Side Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-merge Created 6 years, 8 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_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
6 #define CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 6 #define CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
12 12
13 namespace ui {
14 class PlatformEventSource;
15 }
16
13 class ActiveDesktopMonitor; 17 class ActiveDesktopMonitor;
14 18
15 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts { 19 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
16 public: 20 public:
17 ChromeBrowserMainExtraPartsAura(); 21 ChromeBrowserMainExtraPartsAura();
18 virtual ~ChromeBrowserMainExtraPartsAura(); 22 virtual ~ChromeBrowserMainExtraPartsAura();
19 23
20 // Overridden from ChromeBrowserMainExtraParts: 24 // Overridden from ChromeBrowserMainExtraParts:
21 virtual void PreEarlyInitialization() OVERRIDE; 25 virtual void PreEarlyInitialization() OVERRIDE;
22 virtual void ToolkitInitialized() OVERRIDE; 26 virtual void ToolkitInitialized() OVERRIDE;
23 virtual void PreCreateThreads() OVERRIDE; 27 virtual void PreCreateThreads() OVERRIDE;
24 virtual void PreProfileInit() OVERRIDE; 28 virtual void PreProfileInit() OVERRIDE;
25 virtual void PostMainMessageLoopRun() OVERRIDE; 29 virtual void PostMainMessageLoopRun() OVERRIDE;
26 30
27 private: 31 private:
28 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 32 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
29 // On the Linux desktop, we want to prevent the user from logging in as root, 33 // On the Linux desktop, we want to prevent the user from logging in as root,
30 // so that we don't destroy the profile. 34 // so that we don't destroy the profile.
31 void DetectRunningAsRoot(); 35 void DetectRunningAsRoot();
32 #endif 36 #endif
33 37
34 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_; 38 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
39 scoped_ptr<ui::PlatformEventSource> event_source_;
35 40
36 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura); 41 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
37 }; 42 };
38 43
39 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 44 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698