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

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

Issue 645603003: app_list_folder_item.h: Fix typedefs and includes (ahead of refactor). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | ui/app_list/app_list_folder_item.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 "chrome/browser/ui/app_list/app_list_controller_delegate.h" 5 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_util.h" 9 #include "chrome/browser/extensions/extension_util.h"
10 #include "chrome/browser/extensions/install_tracker_factory.h" 10 #include "chrome/browser/extensions/install_tracker_factory.h"
11 #include "chrome/browser/extensions/launch_util.h" 11 #include "chrome/browser/extensions/launch_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/app_list/extension_uninstaller.h" 13 #include "chrome/browser/ui/app_list/extension_uninstaller.h"
14 #include "chrome/browser/ui/apps/app_info_dialog.h" 14 #include "chrome/browser/ui/apps/app_info_dialog.h"
15 #include "chrome/common/extensions/extension_constants.h" 15 #include "chrome/common/extensions/extension_constants.h"
16 #include "extensions/browser/extension_prefs.h" 16 #include "extensions/browser/extension_prefs.h"
17 #include "extensions/browser/extension_registry.h" 17 #include "extensions/browser/extension_registry.h"
18 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
19 #include "extensions/browser/management_policy.h" 19 #include "extensions/browser/management_policy.h"
20 #include "extensions/common/extension.h" 20 #include "extensions/common/extension.h"
21 #include "extensions/common/extension_set.h" 21 #include "extensions/common/extension_set.h"
22 #include "extensions/common/manifest_handlers/options_page_info.h" 22 #include "extensions/common/manifest_handlers/options_page_info.h"
23 #include "extensions/common/manifest_url_handlers.h" 23 #include "extensions/common/manifest_url_handlers.h"
24 #include "net/base/url_util.h" 24 #include "net/base/url_util.h"
25 #include "ui/app_list/app_list_folder_item.h" 25 #include "ui/app_list/app_list_folder_item.h"
26 #include "ui/app_list/app_list_item.h" 26 #include "ui/app_list/app_list_item.h"
27 #include "ui/app_list/app_list_model.h" 27 #include "ui/app_list/app_list_model.h"
28 #include "ui/app_list/app_list_switches.h" 28 #include "ui/app_list/app_list_switches.h"
29 #include "ui/gfx/geometry/rect.h"
29 30
30 #if defined(ENABLE_RLZ) 31 #if defined(ENABLE_RLZ)
31 #include "chrome/browser/rlz/rlz.h" 32 #include "chrome/browser/rlz/rlz.h"
32 #endif 33 #endif
33 34
34 using extensions::ExtensionRegistry; 35 using extensions::ExtensionRegistry;
35 36
36 namespace { 37 namespace {
37 38
38 const extensions::Extension* GetExtension(Profile* profile, 39 const extensions::Extension* GetExtension(Profile* profile,
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 out_apps->InsertAll(registry->enabled_extensions()); 213 out_apps->InsertAll(registry->enabled_extensions());
213 out_apps->InsertAll(registry->disabled_extensions()); 214 out_apps->InsertAll(registry->disabled_extensions());
214 out_apps->InsertAll(registry->terminated_extensions()); 215 out_apps->InsertAll(registry->terminated_extensions());
215 } 216 }
216 217
217 void AppListControllerDelegate::OnSearchStarted() { 218 void AppListControllerDelegate::OnSearchStarted() {
218 #if defined(ENABLE_RLZ) 219 #if defined(ENABLE_RLZ)
219 RLZTracker::RecordAppListSearch(); 220 RLZTracker::RecordAppListSearch();
220 #endif 221 #endif
221 } 222 }
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/app_list_folder_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698