| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 342 |
| 343 views::View* CreateStartPageWebView(const gfx::Size& size) override { | 343 views::View* CreateStartPageWebView(const gfx::Size& size) override { |
| 344 return NULL; | 344 return NULL; |
| 345 } | 345 } |
| 346 | 346 |
| 347 std::vector<views::View*> CreateCustomPageWebViews( | 347 std::vector<views::View*> CreateCustomPageWebViews( |
| 348 const gfx::Size& size) override { | 348 const gfx::Size& size) override { |
| 349 return std::vector<views::View*>(); | 349 return std::vector<views::View*>(); |
| 350 } | 350 } |
| 351 | 351 |
| 352 void CustomLauncherPageAnimationChanged(double progress) override {} |
| 353 |
| 352 bool IsSpeechRecognitionEnabled() override { return false; } | 354 bool IsSpeechRecognitionEnabled() override { return false; } |
| 353 | 355 |
| 354 scoped_ptr<app_list::AppListModel> model_; | 356 scoped_ptr<app_list::AppListModel> model_; |
| 355 app_list::SpeechUIModel speech_ui_; | 357 app_list::SpeechUIModel speech_ui_; |
| 356 Users users_; | 358 Users users_; |
| 357 | 359 |
| 358 DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate); | 360 DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate); |
| 359 }; | 361 }; |
| 360 | 362 |
| 361 } // namespace | 363 } // namespace |
| 362 | 364 |
| 363 app_list::AppListViewDelegate* CreateAppListViewDelegate() { | 365 app_list::AppListViewDelegate* CreateAppListViewDelegate() { |
| 364 return new ExampleAppListViewDelegate; | 366 return new ExampleAppListViewDelegate; |
| 365 } | 367 } |
| 366 | 368 |
| 367 } // namespace shell | 369 } // namespace shell |
| 368 } // namespace ash | 370 } // namespace ash |
| OLD | NEW |