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

Side by Side Diff: ui/views/test/widget_test.cc

Issue 2409423003: Move WidgetActivationWaiter to a common place (Closed)
Patch Set: based on comments Created 4 years, 2 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
« no previous file with comments | « ui/views/test/widget_test.h ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
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 #include "ui/views/test/widget_test.h" 5 #include "ui/views/test/widget_test.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "ui/gfx/native_widget_types.h" 8 #include "ui/gfx/native_widget_types.h"
9 #include "ui/views/test/native_widget_factory.h" 9 #include "ui/views/test/native_widget_factory.h"
10 #include "ui/views/widget/root_view.h" 10 #include "ui/views/widget/root_view.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 GetWidget()->Init(params); 143 GetWidget()->Init(params);
144 GetWidget()->GetContentsView()->AddChildView(view_); 144 GetWidget()->GetContentsView()->AddChildView(view_);
145 } 145 }
146 146
147 TestInitialFocusWidgetDelegate::~TestInitialFocusWidgetDelegate() {} 147 TestInitialFocusWidgetDelegate::~TestInitialFocusWidgetDelegate() {}
148 148
149 View* TestInitialFocusWidgetDelegate::GetInitiallyFocusedView() { 149 View* TestInitialFocusWidgetDelegate::GetInitiallyFocusedView() {
150 return view_; 150 return view_;
151 } 151 }
152 152
153 WidgetActivationWaiter::WidgetActivationWaiter(Widget* widget, bool active)
154 : observed_(false), active_(active) {
155 if (active == widget->IsActive()) {
156 observed_ = true;
157 return;
158 }
159 widget->AddObserver(this);
160 }
161
162 WidgetActivationWaiter::~WidgetActivationWaiter() {}
163
164 void WidgetActivationWaiter::Wait() {
165 if (!observed_)
166 run_loop_.Run();
167 }
168
169 void WidgetActivationWaiter::OnWidgetActivationChanged(Widget* widget,
170 bool active) {
171 if (active_ != active)
172 return;
173
174 observed_ = true;
175 widget->RemoveObserver(this);
176 if (run_loop_.running())
177 run_loop_.Quit();
178 }
179
153 } // namespace test 180 } // namespace test
154 } // namespace views 181 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/widget_test.h ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698