projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 8.36.161.0
[platform/framework/web/crosswalk.git]
/
src
/
xwalk
/
application
/
common
/
application_data.h
diff --git
a/src/xwalk/application/common/application_data.h
b/src/xwalk/application/common/application_data.h
index
488e280
..
fb6d58b
100644
(file)
--- a/
src/xwalk/application/common/application_data.h
+++ b/
src/xwalk/application/common/application_data.h
@@
-32,12
+32,6
@@
class ListValue;
class Version;
}
class Version;
}
-#if defined(OS_TIZEN)
-namespace tizen {
-class AppcoreContext;
-}
-#endif
-
namespace xwalk {
namespace application {
namespace xwalk {
namespace application {
@@
-117,12
+111,6
@@
class ApplicationData : public base::RefCountedThreadSafe<ApplicationData> {
return manifest_.get();
}
return manifest_.get();
}
- // System events
- void SetEvents(const std::set<std::string>& events);
- const std::set<std::string>& GetEvents() const;
-
- bool IsDirty() const { return is_dirty_; }
-
const base::Time& install_time() const { return install_time_; }
// App-related.
const base::Time& install_time() const { return install_time_; }
// App-related.
@@
-131,14
+119,17
@@
class ApplicationData : public base::RefCountedThreadSafe<ApplicationData> {
// Permission related.
StoredPermission GetPermission(
// Permission related.
StoredPermission GetPermission(
- std::string& permission_name) const;
+
const
std::string& permission_name) const;
bool SetPermission(const std::string& permission_name,
StoredPermission perm);
void ClearPermissions();
PermissionSet GetManifestPermissions() const;
bool SetPermission(const std::string& permission_name,
StoredPermission perm);
void ClearPermissions();
PermissionSet GetManifestPermissions() const;
- bool HasMainDocument() const;
- Manifest::PackageType GetPackageType() const;
+ Package::Type GetPackageType() const { return package_type_; }
+
+ bool HasCSPDefined() const;
+
+ bool SetApplicationLocale(const std::string& locale, base::string16* error);
private:
friend class base::RefCountedThreadSafe<ApplicationData>;
private:
friend class base::RefCountedThreadSafe<ApplicationData>;
@@
-224,9
+215,8
@@
class ApplicationData : public base::RefCountedThreadSafe<ApplicationData> {
// Application's persistent permissions.
StoredPermissionMap permission_map_;
// Application's persistent permissions.
StoredPermissionMap permission_map_;
-#if defined(OS_TIZEN)
- scoped_ptr<tizen::AppcoreContext> appcore_context_;
-#endif
+ // The package type, wgt or xpk.
+ Package::Type package_type_;
DISALLOW_COPY_AND_ASSIGN(ApplicationData);
};
DISALLOW_COPY_AND_ASSIGN(ApplicationData);
};