chrome/browser/ui/app_list/extension_app_item.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/alternate_error_tab_observer.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.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/app_list/extension_app_item.h"	5 #include "chrome/browser/ui/app_list/extension_app_item.h"

6	6

7 #include "chrome/app/chrome_command_ids.h"	7 #include "chrome/app/chrome_command_ids.h"

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

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

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

11 #include "chrome/browser/extensions/extension_sorting.h"	11 #include "chrome/browser/extensions/extension_sorting.h"

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

13 #include "chrome/browser/extensions/extension_uninstall_dialog.h"	13 #include "chrome/browser/extensions/extension_uninstall_dialog.h"

14 #include "chrome/browser/extensions/management_policy.h"	14 #include "chrome/browser/extensions/management_policy.h"

15 #include "chrome/browser/prefs/incognito_mode_prefs.h"	15 #include "chrome/browser/prefs/incognito_mode_prefs.h"

	16 #include "chrome/browser/prefs/pref_service.h"

16 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/ui/app_list/app_list_controller.h"	18 #include "chrome/browser/ui/app_list/app_list_controller.h"

18 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_navigator.h"	20 #include "chrome/browser/ui/browser_navigator.h"

20 #include "chrome/browser/ui/browser_tabstrip.h"	21 #include "chrome/browser/ui/browser_tabstrip.h"

21 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

22 #include "chrome/common/extensions/extension.h"	23 #include "chrome/common/extensions/extension.h"

23 #include "chrome/common/extensions/extension_constants.h"	24 #include "chrome/common/extensions/extension_constants.h"

24 #include "chrome/common/extensions/extension_icon_set.h"	25 #include "chrome/common/extensions/extension_icon_set.h"

25 #include "content/public/common/context_menu_params.h"	26 #include "content/public/common/context_menu_params.h"

(...skipping 469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
495 }	496 }

496	497

497 context_menu_model_->AddItemWithStringId(UNINSTALL,	498 context_menu_model_->AddItemWithStringId(UNINSTALL,

498 extension->is_platform_app() ?	499 extension->is_platform_app() ?

499 IDS_APP_LIST_UNINSTALL_ITEM :	500 IDS_APP_LIST_UNINSTALL_ITEM :

500 IDS_EXTENSIONS_UNINSTALL);	501 IDS_EXTENSIONS_UNINSTALL);

501 }	502 }

502	503

503 return context_menu_model_.get();	504 return context_menu_model_.get();

504 }	505 }

OLD	NEW