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

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

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
13 class ActiveDesktopMonitor; 19 class ActiveDesktopMonitor;
14 20
15 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts { 21 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
16 public: 22 public:
17 ChromeBrowserMainExtraPartsAura(); 23 ChromeBrowserMainExtraPartsAura();
18 virtual ~ChromeBrowserMainExtraPartsAura(); 24 virtual ~ChromeBrowserMainExtraPartsAura();
19 25
20 // Overridden from ChromeBrowserMainExtraParts: 26 // Overridden from ChromeBrowserMainExtraParts:
21 virtual void PreProfileInit() OVERRIDE; 27 virtual void PreProfileInit() OVERRIDE;
22 virtual void PostMainMessageLoopRun() OVERRIDE; 28 virtual void PostMainMessageLoopRun() OVERRIDE;
23 29
24 private: 30 private:
31 scoped_ptr<aura::client::StackingClient> stacking_client_;
25 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_; 32 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
26 33
27 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura); 34 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
28 }; 35 };
29 36
30 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_ 37 #endif // CHROME_BROWSER_UI_AURA_CHROME_BROWSER_MAIN_EXTRA_PARTS_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698