diff options
author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
---|---|---|
committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
commit | 042ba8592ac73507fda0135d977b63347b77b873 (patch) | |
tree | 1472630f6960ec5ee2214bd11f33939f7282a70a /ppapi/shared_impl | |
parent | 7e1dc3d25fb9211ae4baf7577ef72afcad78f2e1 (diff) | |
download | chromium_src-042ba8592ac73507fda0135d977b63347b77b873.zip chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.gz chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.bz2 |
Revert 140093 - Open pepper files directly in browser.
This CL merges in the changes for the per-profile plugin process from the
previously retired CL.
Review URL: https://chromiumcodereview.appspot.com/10387195
TBR=tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10477006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
-rw-r--r-- | ppapi/shared_impl/dir_contents.h | 24 | ||||
-rw-r--r-- | ppapi/shared_impl/file_path.cc | 51 | ||||
-rw-r--r-- | ppapi/shared_impl/file_path.h | 47 |
3 files changed, 0 insertions, 122 deletions
diff --git a/ppapi/shared_impl/dir_contents.h b/ppapi/shared_impl/dir_contents.h deleted file mode 100644 index 23b1ec3..0000000 --- a/ppapi/shared_impl/dir_contents.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef PPAPI_SHARED_IMPL_DIR_CONTENTS_H_ -#define PPAPI_SHARED_IMPL_DIR_CONTENTS_H_ - - -#include <vector> - -#include "base/file_path.h" - -namespace ppapi { - -struct DirEntry { - FilePath name; - bool is_dir; -}; - -typedef std::vector<DirEntry> DirContents; - -} // namespace ppapi - -#endif // PPAPI_SHARED_IMPL_DIR_CONTENTS_H_ diff --git a/ppapi/shared_impl/file_path.cc b/ppapi/shared_impl/file_path.cc deleted file mode 100644 index abea27d..0000000 --- a/ppapi/shared_impl/file_path.cc +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2012 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 "ppapi/shared_impl/file_path.h" - -#include <string> - -#if defined(OS_WIN) -#include "base/utf_string_conversions.h" -#endif - -namespace ppapi { - -namespace { - -FilePath GetFilePathFromUTF8(const std::string& utf8_path) { -#if defined(OS_WIN) - return FilePath(UTF8ToUTF16(utf8_path)); -#else - return FilePath(utf8_path); -#endif -} - -} // namespace - -PepperFilePath::PepperFilePath() - : domain_(DOMAIN_INVALID), - path_() { -} - -PepperFilePath::PepperFilePath(Domain domain, const FilePath& path) - : domain_(domain), - path_(path) { - // TODO(viettrungluu): Should we DCHECK() some things here? -} - -// static -PepperFilePath PepperFilePath::MakeAbsolute(const FilePath& path) { - return PepperFilePath(DOMAIN_ABSOLUTE, path); -} - -// static -PepperFilePath PepperFilePath::MakeModuleLocal(const std::string& name, - const char* utf8_path) { - FilePath full_path = GetFilePathFromUTF8(name).Append( - GetFilePathFromUTF8(utf8_path)); - return PepperFilePath(DOMAIN_MODULE_LOCAL, full_path); -} - -} // namespace ppapi diff --git a/ppapi/shared_impl/file_path.h b/ppapi/shared_impl/file_path.h deleted file mode 100644 index 9d44f7c..0000000 --- a/ppapi/shared_impl/file_path.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef PPAPI_SHARED_IMPL_FILE_PATH_H_ -#define PPAPI_SHARED_IMPL_FILE_PATH_H_ - -#include <string> - -#include "base/file_path.h" -#include "ppapi/shared_impl/ppapi_shared_export.h" - -namespace ppapi { - -// TODO(vtl): Once we put |::FilePath| into the |base| namespace, get rid of the -// |Pepper| (or |PEPPER_|) prefixes. Right now, it's just too -// confusing/dangerous! - -class PepperFilePath { - public: - enum Domain { - DOMAIN_INVALID = 0, - DOMAIN_ABSOLUTE, - DOMAIN_MODULE_LOCAL, - - // Used for validity-checking. - DOMAIN_MAX_VALID = DOMAIN_MODULE_LOCAL - }; - - PPAPI_SHARED_EXPORT PepperFilePath(); - PPAPI_SHARED_EXPORT PepperFilePath(Domain d, const FilePath& p); - - static PepperFilePath MakeAbsolute(const FilePath& path); - static PepperFilePath MakeModuleLocal(const std::string& name, - const char* utf8_path); - - Domain domain() const { return domain_; } - const FilePath& path() const { return path_; } - - private: - Domain domain_; - FilePath path_; -}; - -} // namespace ppapi - -#endif // PPAPI_SHARED_IMPL_FILE_PATH_H_ |