OLD | NEW |
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 #include <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "ash/session/session_state_delegate.h" | 8 #include "ash/session/session_state_delegate.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell/example_factory.h" | 10 #include "ash/shell/example_factory.h" |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 virtual void StopSearch() OVERRIDE { | 310 virtual void StopSearch() OVERRIDE { |
311 // Nothing needs to be done. | 311 // Nothing needs to be done. |
312 } | 312 } |
313 | 313 |
314 virtual void ViewInitialized() OVERRIDE { | 314 virtual void ViewInitialized() OVERRIDE { |
315 // Nothing needs to be done. | 315 // Nothing needs to be done. |
316 } | 316 } |
317 | 317 |
318 virtual void Dismiss() OVERRIDE { | 318 virtual void Dismiss() OVERRIDE { |
319 DCHECK(ash::Shell::HasInstance()); | 319 DCHECK(ash::Shell::HasInstance()); |
320 if (Shell::GetInstance()->GetAppListTargetVisibility()) | 320 Shell::GetInstance()->DismissAppList(); |
321 Shell::GetInstance()->ToggleAppList(NULL); | |
322 } | 321 } |
323 | 322 |
324 virtual void ViewClosing() OVERRIDE { | 323 virtual void ViewClosing() OVERRIDE { |
325 // Nothing needs to be done. | 324 // Nothing needs to be done. |
326 } | 325 } |
327 | 326 |
328 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { | 327 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { |
329 return gfx::ImageSkia(); | 328 return gfx::ImageSkia(); |
330 } | 329 } |
331 | 330 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 }; | 370 }; |
372 | 371 |
373 } // namespace | 372 } // namespace |
374 | 373 |
375 app_list::AppListViewDelegate* CreateAppListViewDelegate() { | 374 app_list::AppListViewDelegate* CreateAppListViewDelegate() { |
376 return new ExampleAppListViewDelegate; | 375 return new ExampleAppListViewDelegate; |
377 } | 376 } |
378 | 377 |
379 } // namespace shell | 378 } // namespace shell |
380 } // namespace ash | 379 } // namespace ash |
OLD | NEW |