Index: chrome/common/extensions/extension.h |
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h |
index 28b005e2e00ec479bddc225916e6b5ee9ac70f0f..8072e4ba3f422445dbbf96c680e476921b5a8995 100644 |
--- a/chrome/common/extensions/extension.h |
+++ b/chrome/common/extensions/extension.h |
@@ -647,22 +647,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; |
@@ -1022,13 +1008,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_; |