Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: ash/shell/app_list.cc

Issue 352033002: Added --custom-launcher-page. Adds a page to the experimental launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ash_shell build. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | athena/home/app_list_view_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 347
348 virtual void ShowForProfileByPath( 348 virtual void ShowForProfileByPath(
349 const base::FilePath& profile_path) OVERRIDE { 349 const base::FilePath& profile_path) OVERRIDE {
350 // Nothing needs to be done. 350 // Nothing needs to be done.
351 } 351 }
352 352
353 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE { 353 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE {
354 return NULL; 354 return NULL;
355 } 355 }
356 356
357 virtual views::View* CreateCustomPageWebView(const gfx::Size& size) OVERRIDE {
358 return NULL;
359 }
360
357 virtual bool IsSpeechRecognitionEnabled() OVERRIDE { 361 virtual bool IsSpeechRecognitionEnabled() OVERRIDE {
358 return false; 362 return false;
359 } 363 }
360 364
361 scoped_ptr<app_list::AppListModel> model_; 365 scoped_ptr<app_list::AppListModel> model_;
362 app_list::SpeechUIModel speech_ui_; 366 app_list::SpeechUIModel speech_ui_;
363 Users users_; 367 Users users_;
364 368
365 DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate); 369 DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
366 }; 370 };
367 371
368 } // namespace 372 } // namespace
369 373
370 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 374 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
371 return new ExampleAppListViewDelegate; 375 return new ExampleAppListViewDelegate;
372 } 376 }
373 377
374 } // namespace shell 378 } // namespace shell
375 } // namespace ash 379 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | athena/home/app_list_view_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698