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