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

Unified Diff: ui/views/widget/desktop_aura/desktop_focus_rules.h

Issue 23903056: Add a container window to host the desktop window hierarchy in AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_focus_rules.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_focus_rules.h
===================================================================
--- ui/views/widget/desktop_aura/desktop_focus_rules.h (revision 224198)
+++ ui/views/widget/desktop_aura/desktop_focus_rules.h (working copy)
@@ -11,13 +11,17 @@
class DesktopFocusRules : public corewm::BaseFocusRules {
public:
- DesktopFocusRules();
+ explicit DesktopFocusRules(aura::Window* content_window);
virtual ~DesktopFocusRules();
private:
// Overridden from corewm::BaseFocusRules:
virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE;
+ // The content window. This is an activatable window even though it is a
+ // child.
+ aura::Window* content_window_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopFocusRules);
};
« no previous file with comments | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698