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

Unified Diff: chrome/browser/android/chrome_main_delegate_staging_android.cc

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/chrome_main_delegate_staging_android.cc
diff --git a/chrome/browser/android/chrome_main_delegate_staging_android.cc b/chrome/browser/android/chrome_main_delegate_staging_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3b072b06008ec7882c8e0ba1932d27bf4926031e
--- /dev/null
+++ b/chrome/browser/android/chrome_main_delegate_staging_android.cc
@@ -0,0 +1,66 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/android/chrome_main_delegate_staging_android.h"
+
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/logging.h"
+#include "base/path_service.h"
+#include "components/policy/core/common/policy_provider_android.h"
+
+
+ChromeMainDelegateStagingAndroid::ChromeMainDelegateStagingAndroid() {
+}
+
+ChromeMainDelegateStagingAndroid::~ChromeMainDelegateStagingAndroid() {
+}
+
+bool ChromeMainDelegateStagingAndroid::BasicStartupComplete(int* exit_code) {
+#if defined(SAFE_BROWSING_SERVICE)
+ spdy_proxy_throttle_factory_ .reset(new SpdyProxyResourceThrottleFactory());
+ SafeBrowsingResourceThrottleFactory::RegisterFactory(
+ spdy_proxy_throttle_factory_.get());
+#endif
+ policy::PolicyProviderAndroid::SetShouldWaitForPolicy(true);
+
+ return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);
+}
+
+int ChromeMainDelegateStagingAndroid::RunProcess(
+ const std::string& process_type,
+ const content::MainFunctionParams& main_function_params) {
+ if (process_type.empty()) {
+ // By default, Android creates the directory accessible by others.
+ // We'd like to tighten security and make it accessible only by
+ // the browser process.
+ base::FilePath data_path;
+ bool ok = PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);
+ if (ok) {
+ int permissions;
+ ok = base::GetPosixFilePermissions(data_path, &permissions);
+ if (ok)
+ permissions &= base::FILE_PERMISSION_USER_MASK;
+ else
+ permissions = base::FILE_PERMISSION_READ_BY_USER |
+ base::FILE_PERMISSION_WRITE_BY_USER |
+ base::FILE_PERMISSION_EXECUTE_BY_USER;
+
+ ok = base::SetPosixFilePermissions(data_path, permissions);
+ }
+ if (!ok)
+ LOG(ERROR) << "Failed to set permission of " << data_path.value().c_str();
+
+ }
+
+ return ChromeMainDelegateAndroid::RunProcess(
+ process_type, main_function_params);
+}
+
+void ChromeMainDelegateStagingAndroid::ProcessExiting(
+ const std::string& process_type) {
+#if defined(SAFE_BROWSING_SERVICE)
+ SafeBrowsingResourceThrottleFactory::RegisterFactory(NULL);
+#endif
+}

Powered by Google App Engine
This is Rietveld 408576698