summaryrefslogtreecommitdiffstats
path: root/ceee
diff options
context:
space:
mode:
authorcindylau@google.com <cindylau@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 01:28:54 +0000
committercindylau@google.com <cindylau@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 01:28:54 +0000
commitc803efe02cff54c79a54611be2744d84292b03f5 (patch)
treecef8155134f03a1bd2958e087c8bf55ff865aaa2 /ceee
parent891152327d2eac696d2ea4f745046e9abd5bbc0e (diff)
downloadchromium_src-c803efe02cff54c79a54611be2744d84292b03f5.zip
chromium_src-c803efe02cff54c79a54611be2744d84292b03f5.tar.gz
chromium_src-c803efe02cff54c79a54611be2744d84292b03f5.tar.bz2
Give CEEE's Chrome Frame more screen real estate in browser tool bands to render extension UI.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5254010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r--ceee/firefox/content/cf.js6
-rw-r--r--ceee/ie/plugin/toolband/tool_band.cc17
2 files changed, 18 insertions, 5 deletions
diff --git a/ceee/firefox/content/cf.js b/ceee/firefox/content/cf.js
index e8dd4f79..ee23b66 100644
--- a/ceee/firefox/content/cf.js
+++ b/ceee/firefox/content/cf.js
@@ -158,10 +158,10 @@ CfHelper.prototype.create = function(parent, idValue, onCfReady, onCfMessage) {
this.cf_.id = idValue;
this.cf_.setAttribute('type', 'application/chromeframe');
- // TODO(rogerta@chromium.org): the height here is arbitrary. We
- // will need to size appropriately when we have more info.
+ // TODO(cindylau@chromium.org): The dimensions should not be hardcoded here.
+ // We should receive UI size info from extensions in the future, if possible.
this.cf_.setAttribute('width', '1440');
- this.cf_.setAttribute('height', '25');
+ this.cf_.setAttribute('height', '31');
this.cf_.setAttribute('flex', '1');
this.cf_.setAttribute('privileged_mode', '1');
this.cf_.setAttribute('chrome_extra_arguments',
diff --git a/ceee/ie/plugin/toolband/tool_band.cc b/ceee/ie/plugin/toolband/tool_band.cc
index c0c74b5..5f34a0b 100644
--- a/ceee/ie/plugin/toolband/tool_band.cc
+++ b/ceee/ie/plugin/toolband/tool_band.cc
@@ -24,6 +24,19 @@
#include "chrome/common/chrome_switches.h"
#include "chrome_frame/com_message_event.h"
+namespace {
+
+// TODO(cindylau@chromium.org): The dimensions should not be hardcoded here.
+// We should receive UI size info from extensions in the future, if possible.
+const int kToolBandMinWidth = 64;
+const int kToolBandHeight = 31;
+
+// Define the type of SHGetPropertyStoreForWindow is SHGPSFW.
+typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *SHGPSFW)(HWND hwnd,
+ REFIID riid,
+ void** ppv);
+} // namespace
+
_ATL_FUNC_INFO ToolBand::handler_type_idispatch_ =
{ CC_STDCALL, VT_EMPTY, 1, { VT_DISPATCH } };
_ATL_FUNC_INFO ToolBand::handler_type_long_ =
@@ -44,8 +57,8 @@ ToolBand::ToolBand()
listening_to_browser_events_(false),
band_id_(0),
is_quitting_(false),
- current_width_(64),
- current_height_(25) {
+ current_width_(kToolBandMinWidth),
+ current_height_(kToolBandHeight) {
TRACE_EVENT_BEGIN("ceee.toolband", this, "");
}