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

Side by Side Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 14699002: Move BrowserAction references from ExtensionPrefs to ExtensionActionAPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest Master for CQ Created 7 years, 7 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 | chrome/browser/extensions/api/extension_action/extension_action_api.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/extensions/api/developer_private/developer_private_api. h" 5 #include "chrome/browser/extensions/api/developer_private/developer_private_api. h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/i18n/file_util_icu.h" 9 #include "base/i18n/file_util_icu.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/devtools/devtools_window.h" 13 #include "chrome/browser/devtools/devtools_window.h"
14 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h" 14 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h"
15 #include "chrome/browser/extensions/api/developer_private/entry_picker.h" 15 #include "chrome/browser/extensions/api/developer_private/entry_picker.h"
16 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
16 #include "chrome/browser/extensions/extension_disabled_ui.h" 17 #include "chrome/browser/extensions/extension_disabled_ui.h"
17 #include "chrome/browser/extensions/extension_error_reporter.h" 18 #include "chrome/browser/extensions/extension_error_reporter.h"
18 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/extensions/extension_system.h" 20 #include "chrome/browser/extensions/extension_system.h"
20 #include "chrome/browser/extensions/management_policy.h" 21 #include "chrome/browser/extensions/management_policy.h"
21 #include "chrome/browser/extensions/shell_window_registry.h" 22 #include "chrome/browser/extensions/shell_window_registry.h"
22 #include "chrome/browser/extensions/unpacked_installer.h" 23 #include "chrome/browser/extensions/unpacked_installer.h"
23 #include "chrome/browser/extensions/updater/extension_updater.h" 24 #include "chrome/browser/extensions/updater/extension_updater.h"
24 #include "chrome/browser/platform_util.h" 25 #include "chrome/browser/platform_util.h"
25 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 // Released by OnRequirementsChecked. 573 // Released by OnRequirementsChecked.
573 AddRef(); 574 AddRef();
574 requirements_checker_->Check( 575 requirements_checker_->Check(
575 extension, 576 extension,
576 base::Bind(&DeveloperPrivateEnableFunction::OnRequirementsChecked, 577 base::Bind(&DeveloperPrivateEnableFunction::OnRequirementsChecked,
577 this, extension_id)); 578 this, extension_id));
578 } else { 579 } else {
579 service->EnableExtension(extension_id); 580 service->EnableExtension(extension_id);
580 581
581 // Make sure any browser action contained within it is not hidden. 582 // Make sure any browser action contained within it is not hidden.
582 prefs->SetBrowserActionVisibility(extension, true); 583 ExtensionActionAPI::SetBrowserActionVisibility(
584 prefs, extension->id(), true);
583 } 585 }
584 } else { 586 } else {
585 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION); 587 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
586 } 588 }
587 return true; 589 return true;
588 } 590 }
589 591
590 void DeveloperPrivateEnableFunction::OnRequirementsChecked( 592 void DeveloperPrivateEnableFunction::OnRequirementsChecked(
591 std::string extension_id, 593 std::string extension_id,
592 std::vector<std::string> requirements_errors) { 594 std::vector<std::string> requirements_errors) {
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 1246
1245 #undef SET_STRING 1247 #undef SET_STRING
1246 return true; 1248 return true;
1247 } 1249 }
1248 1250
1249 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {} 1251 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {}
1250 1252
1251 } // namespace api 1253 } // namespace api
1252 1254
1253 } // namespace extensions 1255 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/extension_action/extension_action_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698