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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SimpleMessageBoxViews asan failure. Created 7 years, 11 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 aura {
14 namespace client {
15 class StackingClient;
16 }
17 }
18
19 class ActiveDesktopMonitor; 13 class ActiveDesktopMonitor;
20 14
21 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts { 15 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
22 public: 16 public:
23 ChromeBrowserMainExtraPartsAura(); 17 ChromeBrowserMainExtraPartsAura();
24 virtual ~ChromeBrowserMainExtraPartsAura(); 18 virtual ~ChromeBrowserMainExtraPartsAura();
25 19
26 // Overridden from ChromeBrowserMainExtraParts: 20 // Overridden from ChromeBrowserMainExtraParts:
27 virtual void PreProfileInit() OVERRIDE; 21 virtual void PreProfileInit() OVERRIDE;
28 virtual void PostMainMessageLoopRun() OVERRIDE; 22 virtual void PostMainMessageLoopRun() OVERRIDE;
29 23
30 private: 24 private:
31 scoped_ptr<aura::client::StackingClient> stacking_client_;
32 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_; 25 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
33 26
34 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura); 27 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
35 }; 28 };
36 29
37 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 30 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698