summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container.cc
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 22:09:03 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 22:09:03 +0000
commit95c3c59d275042225cda4589525cb279f66f1f2c (patch)
treef9fc3164096b65db04c60060a882bf68e7d5d7df /chrome/browser/external_tab_container.cc
parent7d7b882f49e7c33e1ad7b113234fd6af94fac608 (diff)
downloadchromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.zip
chromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.tar.gz
chromium_src-95c3c59d275042225cda4589525cb279f66f1f2c.tar.bz2
Remove the defunct SetAccelerator message and replace it with an
automation message to set initial settings. BUG=none TEST=none Review URL: http://codereview.chromium.org/155376 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.cc')
-rw-r--r--chrome/browser/external_tab_container.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index a2d71b5..acc6e9d 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -27,15 +27,10 @@
static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
-// TODO(sanjeevr): The external_accel_table_ and external_accel_entry_count_
-// member variables are now obsolete and we don't use them.
-// We need to remove them.
ExternalTabContainer::ExternalTabContainer(
AutomationProvider* automation, AutomationResourceMessageFilter* filter)
: automation_(automation),
tab_contents_(NULL),
- external_accel_table_(NULL),
- external_accel_entry_count_(0),
tab_contents_container_(NULL),
tab_handle_(0),
ignore_next_load_notification_(false),
@@ -50,12 +45,15 @@ ExternalTabContainer::~ExternalTabContainer() {
bool ExternalTabContainer::Init(Profile* profile,
HWND parent,
const gfx::Rect& bounds,
- DWORD style) {
+ DWORD style,
+ bool load_requests_via_automation) {
if (IsWindow()) {
NOTREACHED();
return false;
}
+ load_requests_via_automation_ = load_requests_via_automation;
+
set_window_style(WS_POPUP);
views::WidgetWin::Init(NULL, bounds);
if (!IsWindow()) {
@@ -117,12 +115,6 @@ bool ExternalTabContainer::Init(Profile* profile,
return true;
}
-void ExternalTabContainer::SetAccelerators(HACCEL accel_table,
- int accel_table_entry_count) {
- external_accel_table_ = accel_table;
- external_accel_entry_count_ = accel_table_entry_count;
-}
-
void ExternalTabContainer::ProcessUnhandledAccelerator(const MSG& msg) {
// We just received an accelerator key that we had sent to external host
// back. Since the external host was not interested in handling this, we