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

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

Issue 1166823002: Add a chrome://flag for the App Info dialog on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150603-MacViews-ModalChildConstrained-fromcl
Patch Set: Rebase after typo fix Created 5 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
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/gfx/geometry/rect.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
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 Profile* profile, 80 Profile* profile,
80 const std::string& app_id) { 81 const std::string& app_id) {
81 const extensions::Extension* extension = GetExtension(profile, app_id); 82 const extensions::Extension* extension = GetExtension(profile, app_id);
82 const extensions::ManagementPolicy* policy = 83 const extensions::ManagementPolicy* policy =
83 extensions::ExtensionSystem::Get(profile)->management_policy(); 84 extensions::ExtensionSystem::Get(profile)->management_policy();
84 return extension && 85 return extension &&
85 policy->UserMayModifySettings(extension, NULL); 86 policy->UserMayModifySettings(extension, NULL);
86 } 87 }
87 88
88 bool AppListControllerDelegate::CanDoShowAppInfoFlow() { 89 bool AppListControllerDelegate::CanDoShowAppInfoFlow() {
90 #if defined(OS_MACOSX)
91 // Cocoa app list doesn't yet support the app info dialog.
92 if (!app_list::switches::IsMacViewsAppListEnabled())
93 return false;
94 #endif
89 return CanShowAppInfoDialog(); 95 return CanShowAppInfoDialog();
90 } 96 }
91 97
92 void AppListControllerDelegate::DoShowAppInfoFlow( 98 void AppListControllerDelegate::DoShowAppInfoFlow(
93 Profile* profile, 99 Profile* profile,
94 const std::string& extension_id) { 100 const std::string& extension_id) {
95 DCHECK(CanDoShowAppInfoFlow()); 101 DCHECK(CanDoShowAppInfoFlow());
96 ExtensionService* service = 102 ExtensionService* service =
97 extensions::ExtensionSystem::Get(profile)->extension_service(); 103 extensions::ExtensionSystem::Get(profile)->extension_service();
98 DCHECK(service); 104 DCHECK(service);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 out_apps->InsertAll(registry->enabled_extensions()); 215 out_apps->InsertAll(registry->enabled_extensions());
210 out_apps->InsertAll(registry->disabled_extensions()); 216 out_apps->InsertAll(registry->disabled_extensions());
211 out_apps->InsertAll(registry->terminated_extensions()); 217 out_apps->InsertAll(registry->terminated_extensions());
212 } 218 }
213 219
214 void AppListControllerDelegate::OnSearchStarted() { 220 void AppListControllerDelegate::OnSearchStarted() {
215 #if defined(ENABLE_RLZ) 221 #if defined(ENABLE_RLZ)
216 RLZTracker::RecordAppListSearch(); 222 RLZTracker::RecordAppListSearch();
217 #endif 223 #endif
218 } 224 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698