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

Side by Side Diff: ash/launcher/launcher.h

Issue 11588008: Compile fix for r173417. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed code style. Created 8 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_LAUNCHER_LAUNCHER_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_H_
6 #define ASH_LAUNCHER_LAUNCHER_H_ 6 #define ASH_LAUNCHER_LAUNCHER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/background_animator.h" 9 #include "ash/launcher/background_animator.h"
10 #include "ash/launcher/launcher_types.h" 10 #include "ash/launcher/launcher_types.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 views::Widget* GetDimmerWidgetForTest() { return dimmer_.get(); } 124 views::Widget* GetDimmerWidgetForTest() { return dimmer_.get(); }
125 125
126 aura::Window* window_container() { return window_container_; } 126 aura::Window* window_container() { return window_container_; }
127 127
128 // Called by the activation delegate, before the launcher is activated 128 // Called by the activation delegate, before the launcher is activated
129 // when no other windows are visible. 129 // when no other windows are visible.
130 void WillActivateAsFallback() { activating_as_fallback_ = true; } 130 void WillActivateAsFallback() { activating_as_fallback_ = true; }
131 131
132 // Overridden from views::WidgetObserver: 132 // Overridden from views::WidgetObserver:
133 void OnWidgetActivationChanged(views::Widget* widget, bool active) OVERRIDE; 133 virtual void OnWidgetActivationChanged(views::Widget* widget,
134 bool active) OVERRIDE;
134 135
135 private: 136 private:
136 class DelegateView; 137 class DelegateView;
137 138
138 // Widget hosting the view. 139 // Widget hosting the view.
139 scoped_ptr<views::Widget> widget_; 140 scoped_ptr<views::Widget> widget_;
140 scoped_ptr<views::Widget> dimmer_; 141 scoped_ptr<views::Widget> dimmer_;
141 142
142 aura::Window* window_container_; 143 aura::Window* window_container_;
143 144
(...skipping 15 matching lines...) Expand all
159 160
160 // Used then activation is forced from the activation delegate. 161 // Used then activation is forced from the activation delegate.
161 bool activating_as_fallback_; 162 bool activating_as_fallback_;
162 163
163 DISALLOW_COPY_AND_ASSIGN(Launcher); 164 DISALLOW_COPY_AND_ASSIGN(Launcher);
164 }; 165 };
165 166
166 } // namespace ash 167 } // namespace ash
167 168
168 #endif // ASH_LAUNCHER_LAUNCHER_H_ 169 #endif // ASH_LAUNCHER_LAUNCHER_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698