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

Unified Diff: chrome/common/extensions/extension.h

Issue 10080017: Switch platform apps from a declarative launch container to handling an onLaunched event. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove debug logging code Created 8 years, 8 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
« no previous file with comments | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 749cee9652ead2a1d3f716e3b2c9818fe523c97d..764abeea002fff754dd941154a33b28357ad76e2 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -665,22 +665,8 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
extension_misc::LaunchContainer launch_container() const {
return launch_container_;
}
- int launch_width() const {
- return std::max(launch_min_width_,
- launch_max_width_ ?
- std::min(launch_max_width_, launch_width_) :
- launch_width_);
- }
- int launch_height() const {
- return std::max(launch_min_height_,
- launch_max_height_ ?
- std::min(launch_max_height_, launch_height_) :
- launch_height_);
- }
- int launch_min_width() const { return launch_min_width_; }
- int launch_min_height() const { return launch_min_height_; }
- int launch_max_width() const { return launch_max_width_; }
- int launch_max_height() const { return launch_max_height_; }
+ int launch_width() const { return launch_width_; }
+ int launch_height() const { return launch_height_; }
// Theme-related.
bool is_theme() const;
@@ -1047,13 +1033,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
int launch_width_;
int launch_height_;
- // The minimum and maximum size of the container. Only respected for the
- // shell container.
- int launch_min_width_;
- int launch_min_height_;
- int launch_max_width_;
- int launch_max_height_;
-
// The Omnibox keyword for this extension, or empty if there is none.
std::string omnibox_keyword_;
« no previous file with comments | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698