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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert Created 6 years, 1 month 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/webui/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/saved_files_service.h" 8 #include "apps/saved_files_service.h"
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/extensions/updater/extension_updater.h" 42 #include "chrome/browser/extensions/updater/extension_updater.h"
43 #include "chrome/browser/extensions/webstore_reinstaller.h" 43 #include "chrome/browser/extensions/webstore_reinstaller.h"
44 #include "chrome/browser/platform_util.h" 44 #include "chrome/browser/platform_util.h"
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" 45 #include "chrome/browser/prefs/incognito_mode_prefs.h"
46 #include "chrome/browser/profiles/profile.h" 46 #include "chrome/browser/profiles/profile.h"
47 #include "chrome/browser/tab_contents/background_contents.h" 47 #include "chrome/browser/tab_contents/background_contents.h"
48 #include "chrome/browser/ui/apps/app_info_dialog.h" 48 #include "chrome/browser/ui/apps/app_info_dialog.h"
49 #include "chrome/browser/ui/browser.h" 49 #include "chrome/browser/ui/browser.h"
50 #include "chrome/browser/ui/browser_finder.h" 50 #include "chrome/browser/ui/browser_finder.h"
51 #include "chrome/browser/ui/browser_window.h" 51 #include "chrome/browser/ui/browser_window.h"
52 #include "chrome/browser/ui/extensions/app_launch_params.h"
53 #include "chrome/browser/ui/extensions/application_launch.h" 52 #include "chrome/browser/ui/extensions/application_launch.h"
54 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" 53 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
55 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 54 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
56 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
57 #include "chrome/common/chrome_version_info.h" 56 #include "chrome/common/chrome_version_info.h"
58 #include "chrome/common/extensions/features/feature_channel.h" 57 #include "chrome/common/extensions/features/feature_channel.h"
59 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
60 #include "chrome/common/url_constants.h" 59 #include "chrome/common/url_constants.h"
61 #include "chrome/grit/chromium_strings.h" 60 #include "chrome/grit/chromium_strings.h"
62 #include "chrome/grit/generated_resources.h" 61 #include "chrome/grit/generated_resources.h"
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1022
1024 void ExtensionSettingsHandler::HandleLaunchMessage( 1023 void ExtensionSettingsHandler::HandleLaunchMessage(
1025 const base::ListValue* args) { 1024 const base::ListValue* args) {
1026 CHECK_EQ(1U, args->GetSize()); 1025 CHECK_EQ(1U, args->GetSize());
1027 std::string extension_id; 1026 std::string extension_id;
1028 CHECK(args->GetString(0, &extension_id)); 1027 CHECK(args->GetString(0, &extension_id));
1029 const Extension* extension = 1028 const Extension* extension =
1030 extension_service_->GetExtensionById(extension_id, false); 1029 extension_service_->GetExtensionById(extension_id, false);
1031 OpenApplication(AppLaunchParams(extension_service_->profile(), extension, 1030 OpenApplication(AppLaunchParams(extension_service_->profile(), extension,
1032 extensions::LAUNCH_CONTAINER_WINDOW, 1031 extensions::LAUNCH_CONTAINER_WINDOW,
1033 NEW_WINDOW, 1032 NEW_WINDOW));
1034 extensions::SOURCE_EXTENSIONS_PAGE));
1035 } 1033 }
1036 1034
1037 void ExtensionSettingsHandler::HandleReloadMessage( 1035 void ExtensionSettingsHandler::HandleReloadMessage(
1038 const base::ListValue* args) { 1036 const base::ListValue* args) {
1039 std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args)); 1037 std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args));
1040 CHECK(!extension_id.empty()); 1038 CHECK(!extension_id.empty());
1041 extension_service_->ReloadExtensionWithQuietFailure(extension_id); 1039 extension_service_->ReloadExtensionWithQuietFailure(extension_id);
1042 } 1040 }
1043 1041
1044 void ExtensionSettingsHandler::HandleRepairMessage( 1042 void ExtensionSettingsHandler::HandleRepairMessage(
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 extension_service_->EnableExtension(extension_id); 1514 extension_service_->EnableExtension(extension_id);
1517 } else { 1515 } else {
1518 ExtensionErrorReporter::GetInstance()->ReportError( 1516 ExtensionErrorReporter::GetInstance()->ReportError(
1519 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1517 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1520 true); // Be noisy. 1518 true); // Be noisy.
1521 } 1519 }
1522 requirements_checker_.reset(); 1520 requirements_checker_.reset();
1523 } 1521 }
1524 1522
1525 } // namespace extensions 1523 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698