diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-01-13 17:00:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 01:03:00 +0000 |
| commit | 78a50272ee606506c156aa4b34f4f03c5a4f654a (patch) | |
| tree | 6a1adc7e250832dc816ab6e6e7701bcad9771615 /extensions/common/guest_view | |
| parent | 9cf3c6f4c0a79991a5ebacebee62adb0fb267861 (diff) | |
| download | chromium_src-78a50272ee606506c156aa4b34f4f03c5a4f654a.zip chromium_src-78a50272ee606506c156aa4b34f4f03c5a4f654a.tar.gz chromium_src-78a50272ee606506c156aa4b34f4f03c5a4f654a.tar.bz2 | |
Revert of Implemented explicit resizing from guestview. (patchset #6 id:120001 of https://codereview.chromium.org/847893002/)
Reason for revert:
Broke out of process PDF.
Original issue's description:
> Implemented explicit resizing from guestview.
>
> A guest can now be explicitly resized (in addition to autosizing) from guest_view.js, using the new |setSize| function. This new function combines autosizing and normal resizing, as described in: https://docs.google.com/document/d/1EJfmJSK0JJsxKptSRhepnsOOwvXJNv5nnJ1pZdjGDRQ
>
> BUG=434226
>
> Committed: https://crrev.com/681a4fc1d1ac77a17c69ba23fa6710a0e3aa206f
> Cr-Commit-Position: refs/heads/master@{#311286}
TBR=paulmeyer@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=434226
Review URL: https://codereview.chromium.org/800543005
Cr-Commit-Position: refs/heads/master@{#311379}
Diffstat (limited to 'extensions/common/guest_view')
| -rw-r--r-- | extensions/common/guest_view/guest_view_constants.cc | 6 | ||||
| -rw-r--r-- | extensions/common/guest_view/guest_view_constants.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/extensions/common/guest_view/guest_view_constants.cc b/extensions/common/guest_view/guest_view_constants.cc index 3ef82a6..465d6ba 100644 --- a/extensions/common/guest_view/guest_view_constants.cc +++ b/extensions/common/guest_view/guest_view_constants.cc @@ -6,14 +6,12 @@ namespace guestview { -// Sizing attributes/parameters. +// Sizing Attributes. const char kAttributeAutoSize[] = "autosize"; const char kAttributeMaxHeight[] = "maxheight"; const char kAttributeMaxWidth[] = "maxwidth"; const char kAttributeMinHeight[] = "minheight"; const char kAttributeMinWidth[] = "minwidth"; -const char kElementWidth[] = "elementWidth"; -const char kElementHeight[] = "elementHeight"; // Parameters/properties on events. const char kIsTopLevel[] = "isTopLevel"; @@ -28,7 +26,5 @@ const char kParameterInstanceId[] = "instanceId"; // Other. const char kGuestViewManagerKeyName[] = "guest_view_manager"; const int kInstanceIDNone = 0; -const int kDefaultWidth = 300; -const int kDefaultHeight = 300; } // namespace guestview diff --git a/extensions/common/guest_view/guest_view_constants.h b/extensions/common/guest_view/guest_view_constants.h index 4f874cc..36c3fee 100644 --- a/extensions/common/guest_view/guest_view_constants.h +++ b/extensions/common/guest_view/guest_view_constants.h @@ -9,14 +9,12 @@ namespace guestview { -// Sizing attributes/parameters. +// Sizing Attributes. extern const char kAttributeAutoSize[]; extern const char kAttributeMaxHeight[]; extern const char kAttributeMaxWidth[]; extern const char kAttributeMinHeight[]; extern const char kAttributeMinWidth[]; -extern const char kElementWidth[]; -extern const char kElementHeight[]; // Parameters/properties on events. extern const char kIsTopLevel[]; @@ -31,8 +29,6 @@ extern const char kParameterInstanceId[]; // Other. extern const char kGuestViewManagerKeyName[]; extern const int kInstanceIDNone; -extern const int kDefaultWidth; -extern const int kDefaultHeight; } // namespace guestview |