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

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: 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
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/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/devtools/devtools_window.h" 12 #include "chrome/browser/devtools/devtools_window.h"
13 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h" 13 #include "chrome/browser/extensions/api/developer_private/developer_private_api_ factory.h"
14 #include "chrome/browser/extensions/api/developer_private/entry_picker.h" 14 #include "chrome/browser/extensions/api/developer_private/entry_picker.h"
15 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
15 #include "chrome/browser/extensions/extension_disabled_ui.h" 16 #include "chrome/browser/extensions/extension_disabled_ui.h"
16 #include "chrome/browser/extensions/extension_error_reporter.h" 17 #include "chrome/browser/extensions/extension_error_reporter.h"
17 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/extensions/extension_system.h" 19 #include "chrome/browser/extensions/extension_system.h"
19 #include "chrome/browser/extensions/management_policy.h" 20 #include "chrome/browser/extensions/management_policy.h"
20 #include "chrome/browser/extensions/shell_window_registry.h" 21 #include "chrome/browser/extensions/shell_window_registry.h"
21 #include "chrome/browser/extensions/unpacked_installer.h" 22 #include "chrome/browser/extensions/unpacked_installer.h"
22 #include "chrome/browser/extensions/updater/extension_updater.h" 23 #include "chrome/browser/extensions/updater/extension_updater.h"
23 #include "chrome/browser/platform_util.h" 24 #include "chrome/browser/platform_util.h"
24 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 // Released by OnRequirementsChecked. 581 // Released by OnRequirementsChecked.
581 AddRef(); 582 AddRef();
582 requirements_checker_->Check( 583 requirements_checker_->Check(
583 extension, 584 extension,
584 base::Bind(&DeveloperPrivateEnableFunction::OnRequirementsChecked, 585 base::Bind(&DeveloperPrivateEnableFunction::OnRequirementsChecked,
585 this, extension_id)); 586 this, extension_id));
586 } else { 587 } else {
587 service->EnableExtension(extension_id); 588 service->EnableExtension(extension_id);
588 589
589 // Make sure any browser action contained within it is not hidden. 590 // Make sure any browser action contained within it is not hidden.
590 prefs->SetBrowserActionVisibility(extension, true); 591 ExtensionActionAPI::SetBrowserActionVisibility(
592 prefs, extension->id(), true);
591 } 593 }
592 } else { 594 } else {
593 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION); 595 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
594 } 596 }
595 return true; 597 return true;
596 } 598 }
597 599
598 void DeveloperPrivateEnableFunction::OnRequirementsChecked( 600 void DeveloperPrivateEnableFunction::OnRequirementsChecked(
599 std::string extension_id, 601 std::string extension_id,
600 std::vector<std::string> requirements_errors) { 602 std::vector<std::string> requirements_errors) {
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 1196
1195 #undef SET_STRING 1197 #undef SET_STRING
1196 return true; 1198 return true;
1197 } 1199 }
1198 1200
1199 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {} 1201 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {}
1200 1202
1201 } // namespace api 1203 } // namespace api
1202 1204
1203 } // namespace extensions 1205 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698