summaryrefslogtreecommitdiff
path: root/chromium/extensions/shell
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/extensions/shell')
-rw-r--r--chromium/extensions/shell/BUILD.gn10
-rw-r--r--chromium/extensions/shell/app/shell_main_delegate.cc3
-rw-r--r--chromium/extensions/shell/app/shell_main_delegate.h5
-rw-r--r--chromium/extensions/shell/browser/desktop_controller.cc2
-rw-r--r--chromium/extensions/shell/browser/shell_browser_main_parts.cc9
-rw-r--r--chromium/extensions/shell/browser/shell_content_browser_client.cc11
-rw-r--r--chromium/extensions/shell/browser/shell_desktop_controller_aura.cc6
-rw-r--r--chromium/extensions/shell/browser/shell_extension_system.cc28
-rw-r--r--chromium/extensions/shell/browser/shell_extension_system.h3
-rw-r--r--chromium/extensions/shell/browser/shell_extensions_browser_client.cc5
-rw-r--r--chromium/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc9
11 files changed, 42 insertions, 49 deletions
diff --git a/chromium/extensions/shell/BUILD.gn b/chromium/extensions/shell/BUILD.gn
index 34fdf7d4bc1..c8076b3e7ef 100644
--- a/chromium/extensions/shell/BUILD.gn
+++ b/chromium/extensions/shell/BUILD.gn
@@ -72,16 +72,17 @@ source_set("app_shell_lib") {
# TODO(michaelpg): remove Mac support and always use aura.
if (use_aura) {
- deps += [
- "//ui/aura",
- "//ui/views",
- ]
+ deps += [ "//ui/aura" ]
if (use_x11) {
deps += [ "//ui/events/devices/x11" ]
}
}
+ if (toolkit_views) {
+ deps += [ "//ui/views" ]
+ }
+
sources = [
"app/shell_main_delegate.cc",
"app/shell_main_delegate.h",
@@ -183,6 +184,7 @@ source_set("app_shell_lib") {
"browser/shell_native_app_window_aura.h",
]
deps += [
+ "//ui/base/cursor",
"//ui/base/cursor/mojom:cursor_type",
"//ui/platform_window",
"//ui/wm",
diff --git a/chromium/extensions/shell/app/shell_main_delegate.cc b/chromium/extensions/shell/app/shell_main_delegate.cc
index 27b627e3c05..a5e0f6c2c6b 100644
--- a/chromium/extensions/shell/app/shell_main_delegate.cc
+++ b/chromium/extensions/shell/app/shell_main_delegate.cc
@@ -184,8 +184,7 @@ void ShellMainDelegate::ProcessExiting(const std::string& process_type) {
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
void ShellMainDelegate::ZygoteStarting(
- std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
- delegates) {
+ std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
#if BUILDFLAG(ENABLE_NACL)
nacl::AddNaClZygoteForkDelegates(delegates);
#endif // BUILDFLAG(ENABLE_NACL)
diff --git a/chromium/extensions/shell/app/shell_main_delegate.h b/chromium/extensions/shell/app/shell_main_delegate.h
index d31688b9e69..5d6842e79b5 100644
--- a/chromium/extensions/shell/app/shell_main_delegate.h
+++ b/chromium/extensions/shell/app/shell_main_delegate.h
@@ -34,9 +34,8 @@ class ShellMainDelegate : public content::ContentMainDelegate {
content::ContentRendererClient* CreateContentRendererClient() override;
void ProcessExiting(const std::string& process_type) override;
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
- void ZygoteStarting(
- std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
- delegates) override;
+ void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
+ delegates) override;
#endif
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
void ZygoteForked() override;
diff --git a/chromium/extensions/shell/browser/desktop_controller.cc b/chromium/extensions/shell/browser/desktop_controller.cc
index 721d7377ae3..92f9e93066c 100644
--- a/chromium/extensions/shell/browser/desktop_controller.cc
+++ b/chromium/extensions/shell/browser/desktop_controller.cc
@@ -4,6 +4,8 @@
#include "extensions/shell/browser/desktop_controller.h"
+#include <ostream>
+
#include "base/check.h"
#include "base/macros.h"
diff --git a/chromium/extensions/shell/browser/shell_browser_main_parts.cc b/chromium/extensions/shell/browser/shell_browser_main_parts.cc
index 337f65ebd0e..16f657b963c 100644
--- a/chromium/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/chromium/extensions/shell/browser/shell_browser_main_parts.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/memory/ref_counted.h"
-#include "base/task/post_task.h"
#include "build/build_config.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/nacl/common/buildflags.h"
@@ -85,7 +84,6 @@ using base::CommandLine;
using content::BrowserContext;
#if BUILDFLAG(ENABLE_NACL)
-using content::BrowserThread;
#endif
namespace extensions {
@@ -235,9 +233,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
std::make_unique<ShellNaClBrowserDelegate>(browser_context_.get()));
// Track the task so it can be canceled if app_shell shuts down very quickly,
// such as in browser tests.
- task_tracker_.PostTask(
- base::CreateSingleThreadTaskRunner({BrowserThread::IO}).get(), FROM_HERE,
- base::BindOnce(nacl::NaClProcessHost::EarlyStartup));
+ task_tracker_.PostTask(content::GetIOThreadTaskRunner({}).get(), FROM_HERE,
+ base::BindOnce(nacl::NaClProcessHost::EarlyStartup));
#endif
content::ShellDevToolsManagerDelegate::StartHttpHandler(
@@ -279,7 +276,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
browser_context_.get());
- extension_system_ = NULL;
+ extension_system_ = nullptr;
desktop_controller_.reset();
diff --git a/chromium/extensions/shell/browser/shell_content_browser_client.cc b/chromium/extensions/shell/browser/shell_content_browser_client.cc
index 5b2046bc8fe..90466ae42fe 100644
--- a/chromium/extensions/shell/browser/shell_content_browser_client.cc
+++ b/chromium/extensions/shell/browser/shell_content_browser_client.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/stl_util.h"
-#include "base/task/post_task.h"
#include "components/guest_view/browser/guest_view_message_filter.h"
#include "components/nacl/common/buildflags.h"
#include "content/public/browser/browser_main_runner.h"
@@ -62,8 +61,6 @@
using base::CommandLine;
using content::BrowserContext;
-using content::BrowserThread;
-
namespace extensions {
namespace {
@@ -165,8 +162,8 @@ void ShellContentBrowserClient::SiteInstanceGotProcess(
site_instance->GetProcess()->GetID(),
site_instance->GetId());
- base::PostTask(
- FROM_HERE, {BrowserThread::IO},
+ content::GetIOThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&InfoMap::RegisterExtensionProcess,
browser_main_parts_->extension_system()->info_map(),
extension->id(), site_instance->GetProcess()->GetID(),
@@ -189,8 +186,8 @@ void ShellContentBrowserClient::SiteInstanceDeleting(
site_instance->GetProcess()->GetID(),
site_instance->GetId());
- base::PostTask(
- FROM_HERE, {BrowserThread::IO},
+ content::GetIOThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&InfoMap::UnregisterExtensionProcess,
browser_main_parts_->extension_system()->info_map(),
extension->id(), site_instance->GetProcess()->GetID(),
diff --git a/chromium/extensions/shell/browser/shell_desktop_controller_aura.cc b/chromium/extensions/shell/browser/shell_desktop_controller_aura.cc
index 00cda04068a..ea1f2bcc323 100644
--- a/chromium/extensions/shell/browser/shell_desktop_controller_aura.cc
+++ b/chromium/extensions/shell/browser/shell_desktop_controller_aura.cc
@@ -315,11 +315,13 @@ void ShellDesktopControllerAura::InitWindowManager() {
if (!display::Screen::GetScreen()) {
#if defined(OS_CHROMEOS)
screen_ = std::make_unique<ShellScreen>(this, GetStartingWindowSize());
+ // TODO(pkasting): Make ShellScreen() call SetScreenInstance() as the
+ // classes in CreateDesktopScreen() do, and remove this.
+ display::Screen::SetScreenInstance(screen_.get());
#else
// TODO(crbug.com/756680): Refactor DesktopScreen out of views.
screen_.reset(views::CreateDesktopScreen());
#endif
- display::Screen::SetScreenInstance(screen_.get());
}
focus_controller_ =
@@ -350,7 +352,9 @@ void ShellDesktopControllerAura::TearDownWindowManager() {
cursor_manager_.reset();
focus_controller_.reset();
if (screen_) {
+#if defined(OS_CHROMEOS)
display::Screen::SetScreenInstance(nullptr);
+#endif
screen_.reset();
}
root_window_event_filter_.reset();
diff --git a/chromium/extensions/shell/browser/shell_extension_system.cc b/chromium/extensions/shell/browser/shell_extension_system.cc
index 1ecf006a234..7f44fe09251 100644
--- a/chromium/extensions/shell/browser/shell_extension_system.cc
+++ b/chromium/extensions/shell/browser/shell_extension_system.cc
@@ -11,17 +11,12 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/task/post_task.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
#include "extensions/browser/api/app_runtime/app_runtime_api.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/info_map.h"
-#include "extensions/browser/notification_types.h"
#include "extensions/browser/null_app_sorting.h"
#include "extensions/browser/quota_service.h"
#include "extensions/browser/runtime_data.h"
@@ -32,8 +27,6 @@
#include "extensions/shell/browser/shell_extension_loader.h"
using content::BrowserContext;
-using content::BrowserThread;
-
namespace extensions {
ShellExtensionSystem::ShellExtensionSystem(BrowserContext* browser_context)
@@ -54,10 +47,6 @@ const Extension* ShellExtensionSystem::LoadApp(const base::FilePath& app_dir) {
void ShellExtensionSystem::FinishInitialization() {
// Inform the rest of the extensions system to start.
ready_.Signal();
- content::NotificationService::current()->Notify(
- NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
- content::Source<BrowserContext>(browser_context_),
- content::NotificationService::NoDetails());
}
void ShellExtensionSystem::LaunchApp(const ExtensionId& extension_id) {
@@ -106,7 +95,7 @@ ServiceWorkerManager* ShellExtensionSystem::service_worker_manager() {
return service_worker_manager_.get();
}
-SharedUserScriptMaster* ShellExtensionSystem::shared_user_script_master() {
+SharedUserScriptManager* ShellExtensionSystem::shared_user_script_manager() {
return nullptr;
}
@@ -139,11 +128,12 @@ AppSorting* ShellExtensionSystem::app_sorting() {
void ShellExtensionSystem::RegisterExtensionWithRequestContexts(
const Extension* extension,
base::OnceClosure callback) {
- base::PostTaskAndReply(FROM_HERE, {BrowserThread::IO},
- base::BindOnce(&InfoMap::AddExtension, info_map(),
- base::RetainedRef(extension),
- base::Time::Now(), false, false),
- std::move(callback));
+ content::GetIOThreadTaskRunner({})->PostTaskAndReply(
+ FROM_HERE,
+ base::BindOnce(&InfoMap::AddExtension, info_map(),
+ base::RetainedRef(extension), base::Time::Now(), false,
+ false),
+ std::move(callback));
}
void ShellExtensionSystem::UnregisterExtensionWithRequestContexts(
@@ -154,6 +144,10 @@ const base::OneShotEvent& ShellExtensionSystem::ready() const {
return ready_;
}
+bool ShellExtensionSystem::is_ready() const {
+ return ready_.is_signaled();
+}
+
ContentVerifier* ShellExtensionSystem::content_verifier() {
return nullptr;
}
diff --git a/chromium/extensions/shell/browser/shell_extension_system.h b/chromium/extensions/shell/browser/shell_extension_system.h
index 6f86c315eb3..6ffeb6dad8e 100644
--- a/chromium/extensions/shell/browser/shell_extension_system.h
+++ b/chromium/extensions/shell/browser/shell_extension_system.h
@@ -64,7 +64,7 @@ class ShellExtensionSystem : public ExtensionSystem {
RuntimeData* runtime_data() override;
ManagementPolicy* management_policy() override;
ServiceWorkerManager* service_worker_manager() override;
- SharedUserScriptMaster* shared_user_script_master() override;
+ SharedUserScriptManager* shared_user_script_manager() override;
StateStore* state_store() override;
StateStore* rules_store() override;
scoped_refptr<ValueStoreFactory> store_factory() override;
@@ -78,6 +78,7 @@ class ShellExtensionSystem : public ExtensionSystem {
const std::string& extension_id,
const UnloadedExtensionReason reason) override;
const base::OneShotEvent& ready() const override;
+ bool is_ready() const override;
ContentVerifier* content_verifier() override;
std::unique_ptr<ExtensionSet> GetDependentExtensions(
const Extension* extension) override;
diff --git a/chromium/extensions/shell/browser/shell_extensions_browser_client.cc b/chromium/extensions/shell/browser/shell_extensions_browser_client.cc
index 836d926895e..adb28c9b6dc 100644
--- a/chromium/extensions/shell/browser/shell_extensions_browser_client.cc
+++ b/chromium/extensions/shell/browser/shell_extensions_browser_client.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "base/task/post_task.h"
#include "build/build_config.h"
#include "components/version_info/version_info.h"
#include "content/public/browser/browser_context.h"
@@ -237,8 +236,8 @@ void ShellExtensionsBrowserClient::BroadcastEventToRenderers(
std::unique_ptr<base::ListValue> args,
bool dispatch_to_off_the_record_profiles) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
- base::PostTask(
- FROM_HERE, {BrowserThread::UI},
+ content::GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&ShellExtensionsBrowserClient::BroadcastEventToRenderers,
base::Unretained(this), histogram_value, event_name,
std::move(args), dispatch_to_off_the_record_profiles));
diff --git a/chromium/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc b/chromium/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
index 23c863870df..411da24ff47 100644
--- a/chromium/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
+++ b/chromium/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
@@ -5,7 +5,6 @@
#include "extensions/shell/browser/shell_speech_recognition_manager_delegate.h"
#include "base/bind.h"
-#include "base/task/post_task.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
@@ -76,8 +75,8 @@ void ShellSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
// |render_process_id| field, which is needed later to retrieve the profile.
DCHECK_NE(context.render_process_id, 0);
- base::PostTask(
- FROM_HERE, {BrowserThread::UI},
+ content::GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&CheckRenderFrameType, std::move(callback),
context.render_process_id, context.render_frame_id));
}
@@ -119,8 +118,8 @@ void ShellSpeechRecognitionManagerDelegate::CheckRenderFrameType(
}
}
- base::PostTask(
- FROM_HERE, {BrowserThread::IO},
+ content::GetIOThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(std::move(callback), check_permission, allowed));
}
View Lorry Controller Status