| 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 <memory> | 5 #include <memory> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
| 12 #include "ash/shell.h" | |
| 13 #include "ash/shell/example_factory.h" | 12 #include "ash/shell/example_factory.h" |
| 14 #include "ash/shell/toplevel_window.h" | 13 #include "ash/shell/toplevel_window.h" |
| 15 #include "base/callback.h" | 14 #include "base/callback.h" |
| 16 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
| 17 #include "base/i18n/case_conversion.h" | 16 #include "base/i18n/case_conversion.h" |
| 18 #include "base/i18n/string_search.h" | 17 #include "base/i18n/string_search.h" |
| 19 #include "base/memory/scoped_vector.h" | 18 #include "base/memory/scoped_vector.h" |
| 20 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
| 21 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
| 22 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 296 |
| 298 void StopSearch() override { | 297 void StopSearch() override { |
| 299 // Nothing needs to be done. | 298 // Nothing needs to be done. |
| 300 } | 299 } |
| 301 | 300 |
| 302 void ViewInitialized() override { | 301 void ViewInitialized() override { |
| 303 // Nothing needs to be done. | 302 // Nothing needs to be done. |
| 304 } | 303 } |
| 305 | 304 |
| 306 void Dismiss() override { | 305 void Dismiss() override { |
| 307 DCHECK(Shell::HasInstance()); | 306 DCHECK(WmShell::HasInstance()); |
| 308 Shell::GetInstance()->DismissAppList(); | 307 WmShell::Get()->DismissAppList(); |
| 309 } | 308 } |
| 310 | 309 |
| 311 void ViewClosing() override { | 310 void ViewClosing() override { |
| 312 // Nothing needs to be done. | 311 // Nothing needs to be done. |
| 313 } | 312 } |
| 314 | 313 |
| 315 void OpenHelp() override { | 314 void OpenHelp() override { |
| 316 // Nothing needs to be done. | 315 // Nothing needs to be done. |
| 317 } | 316 } |
| 318 | 317 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 }; | 349 }; |
| 351 | 350 |
| 352 } // namespace | 351 } // namespace |
| 353 | 352 |
| 354 app_list::AppListViewDelegate* CreateAppListViewDelegate() { | 353 app_list::AppListViewDelegate* CreateAppListViewDelegate() { |
| 355 return new ExampleAppListViewDelegate; | 354 return new ExampleAppListViewDelegate; |
| 356 } | 355 } |
| 357 | 356 |
| 358 } // namespace shell | 357 } // namespace shell |
| 359 } // namespace ash | 358 } // namespace ash |
| OLD | NEW |