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

Side by Side Diff: ash/shelf/shelf_window_watcher.h

Issue 108313006: [ash] Don't remove an item when associated window is dragged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Handle re-parenting not to default_container Created 7 years 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
« no previous file with comments | « no previous file | ash/shelf/shelf_window_watcher.cc » ('j') | ash/shelf/shelf_window_watcher.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
7 7
8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h" 8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // Returns the index of LauncherItem associated with |window|. 74 // Returns the index of LauncherItem associated with |window|.
75 int GetLauncherItemIndexForWindow(aura::Window* window) const; 75 int GetLauncherItemIndexForWindow(aura::Window* window) const;
76 76
77 // aura::client::ActivationChangeObserver overrides: 77 // aura::client::ActivationChangeObserver overrides:
78 virtual void OnWindowActivated(aura::Window* gained_active, 78 virtual void OnWindowActivated(aura::Window* gained_active,
79 aura::Window* lost_active) OVERRIDE; 79 aura::Window* lost_active) OVERRIDE;
80 80
81 // aura::WindowObserver overrides: 81 // aura::WindowObserver overrides:
82 virtual void OnWindowAdded(aura::Window* window) OVERRIDE; 82 virtual void OnWindowAdded(aura::Window* window) OVERRIDE;
83 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; 83 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
84 virtual void OnWindowParentChanged(aura::Window* window,
85 aura::Window* parent) OVERRIDE;
84 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 86 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
85 virtual void OnWindowPropertyChanged(aura::Window* window, 87 virtual void OnWindowPropertyChanged(aura::Window* window,
86 const void* key, 88 const void* key,
87 intptr_t old) OVERRIDE; 89 intptr_t old) OVERRIDE;
88 90
89 // gfx::DisplayObserver overrides: 91 // gfx::DisplayObserver overrides:
90 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; 92 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
91 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 93 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
92 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; 94 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
93 95
(...skipping 13 matching lines...) Expand all
107 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, 109 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
108 aura::client::ActivationChangeObserver> observed_activation_clients_; 110 aura::client::ActivationChangeObserver> observed_activation_clients_;
109 111
110 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 112 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
111 }; 113 };
112 114
113 } // namespace internal 115 } // namespace internal
114 } // namespace ash 116 } // namespace ash
115 117
116 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 118 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_window_watcher.cc » ('j') | ash/shelf/shelf_window_watcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698