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

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

Issue 10869007: views/examples: Rename ShowExamplesWindow() to ShowExamplesWindowWithContent(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | ash/shell/window_type_launcher.cc » ('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/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
9 #include "ash/shell/toplevel_window.h" 9 #include "ash/shell/toplevel_window.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 case LOCK_SCREEN: { 110 case LOCK_SCREEN: {
111 Shell::GetInstance()->delegate()->LockScreen(); 111 Shell::GetInstance()->delegate()->LockScreen();
112 break; 112 break;
113 } 113 }
114 case WIDGETS_WINDOW: { 114 case WIDGETS_WINDOW: {
115 CreateWidgetsWindow(); 115 CreateWidgetsWindow();
116 break; 116 break;
117 } 117 }
118 case EXAMPLES_WINDOW: { 118 case EXAMPLES_WINDOW: {
119 #if !defined(OS_MACOSX) 119 #if !defined(OS_MACOSX)
120 views::examples::ShowExamplesWindow( 120 views::examples::ShowExamplesWindowWithContent(
121 views::examples::DO_NOTHING_ON_CLOSE, 121 views::examples::DO_NOTHING_ON_CLOSE,
122 ash::Shell::GetInstance()->browser_context()); 122 ash::Shell::GetInstance()->browser_context());
123 #endif 123 #endif
124 break; 124 break;
125 } 125 }
126 default: 126 default:
127 break; 127 break;
128 } 128 }
129 } 129 }
130 130
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 }; 277 };
278 278
279 } // namespace 279 } // namespace
280 280
281 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 281 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
282 return new ExampleAppListViewDelegate; 282 return new ExampleAppListViewDelegate;
283 } 283 }
284 284
285 } // namespace shell 285 } // namespace shell
286 } // namespace ash 286 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698