OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/app_list/app_list_shower_views.h" | 5 #include "chrome/browser/ui/app_list/app_list_shower_views.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/location.h" |
9 #include "base/profiler/scoped_tracker.h" | 9 #include "base/profiler/scoped_tracker.h" |
| 10 #include "base/single_thread_task_runner.h" |
| 11 #include "base/thread_task_runner_handle.h" |
10 #include "chrome/browser/apps/scoped_keep_alive.h" | 12 #include "chrome/browser/apps/scoped_keep_alive.h" |
11 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/app_list/app_list_shower_delegate.h" | 14 #include "chrome/browser/ui/app_list/app_list_shower_delegate.h" |
13 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" | 15 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
14 #include "ui/app_list/views/app_list_view.h" | 16 #include "ui/app_list/views/app_list_view.h" |
15 #include "ui/gfx/geometry/point.h" | 17 #include "ui/gfx/geometry/point.h" |
16 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
17 | 19 |
18 AppListShower::AppListShower(AppListShowerDelegate* delegate) | 20 AppListShower::AppListShower(AppListShowerDelegate* delegate) |
19 : delegate_(delegate), | 21 : delegate_(delegate), |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 window_icon_updated_ = true; | 137 window_icon_updated_ = true; |
136 } | 138 } |
137 app_list_->GetWidget()->Activate(); | 139 app_list_->GetWidget()->Activate(); |
138 } | 140 } |
139 | 141 |
140 void AppListShower::Hide() { | 142 void AppListShower::Hide() { |
141 app_list_->GetWidget()->Hide(); | 143 app_list_->GetWidget()->Hide(); |
142 } | 144 } |
143 | 145 |
144 void AppListShower::ResetKeepAliveSoon() { | 146 void AppListShower::ResetKeepAliveSoon() { |
145 if (base::MessageLoop::current()) { // NULL in tests. | 147 if (base::ThreadTaskRunnerHandle::IsSet()) { // Not set in tests. |
146 base::MessageLoop::current()->PostTask( | 148 base::ThreadTaskRunnerHandle::Get()->PostTask( |
147 FROM_HERE, | 149 FROM_HERE, |
148 base::Bind(&AppListShower::ResetKeepAlive, base::Unretained(this))); | 150 base::Bind(&AppListShower::ResetKeepAlive, base::Unretained(this))); |
149 return; | 151 return; |
150 } | 152 } |
151 ResetKeepAlive(); | 153 ResetKeepAlive(); |
152 } | 154 } |
153 | 155 |
154 void AppListShower::ResetKeepAlive() { | 156 void AppListShower::ResetKeepAlive() { |
155 keep_alive_.reset(); | 157 keep_alive_.reset(); |
156 } | 158 } |
OLD | NEW |