chrome/browser/ui/ash/app_list/extension_app_item.cc - Issue 10828151: chrome: Copy app_list files from views/ to ash/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/ash/app_list/extension_app_item.cc

Issue 10828151: chrome: Copy app_list files from views/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cp the header files now 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 | « chrome/browser/ui/ash/app_list/extension_app_item.h ('k') | chrome/browser/ui/ash/app_list/search_builder.h » ('j') | no next file with comments »

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 "chrome/browser/ui/views/ash/app_list/extension_app_item.h"	5 #include "chrome/browser/ui/views/ash/app_list/extension_app_item.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/extensions/extension_prefs.h"	8 #include "chrome/browser/extensions/extension_prefs.h"

9 #include "chrome/browser/extensions/extension_service.h"	9 #include "chrome/browser/extensions/extension_service.h"

10 #include "chrome/browser/extensions/extension_system.h"	10 #include "chrome/browser/extensions/extension_system.h"

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
299 LAUNCH_TYPE_FULLSCREEN,	299 LAUNCH_TYPE_FULLSCREEN,

300 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);	300 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);

301 context_menu_model_->AddSeparator();	301 context_menu_model_->AddSeparator();

302 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);	302 context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);

303 context_menu_model_->AddItemWithStringId(UNINSTALL,	303 context_menu_model_->AddItemWithStringId(UNINSTALL,

304 IDS_EXTENSIONS_UNINSTALL);	304 IDS_EXTENSIONS_UNINSTALL);

305 }	305 }

306	306

307 return context_menu_model_.get();	307 return context_menu_model_.get();

308 }	308 }

OLD	NEW