summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browser.cc1
-rw-r--r--chrome/browser/find_in_page_controller.h1
-rw-r--r--chrome/browser/views/frame/browser_view2.cc276
-rw-r--r--chrome/browser/views/frame/browser_view2.h76
-rw-r--r--chrome/browser/views/frame/opaque_frame.cc13
-rw-r--r--chrome/browser/views/frame/opaque_frame.h5
-rw-r--r--chrome/browser/views/info_bubble.h1
-rw-r--r--chrome/views/hwnd_view_container.h8
8 files changed, 349 insertions, 32 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index c89eedf..23d9f7c 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -906,6 +906,7 @@ StatusBubble* Browser::GetStatusBubble() {
// Called whenever the window is moved so that we can update the position
// of any WS_POPUP HWNDs.
+// TODO(beng): This should move to BrowserView2!
void Browser::WindowMoved() {
GetStatusBubble()->Reposition();
diff --git a/chrome/browser/find_in_page_controller.h b/chrome/browser/find_in_page_controller.h
index ed311af..4848cd4 100644
--- a/chrome/browser/find_in_page_controller.h
+++ b/chrome/browser/find_in_page_controller.h
@@ -57,7 +57,6 @@ namespace ChromeViews {
//
////////////////////////////////////////////////////////////////////////////////
class FindInPageController : public NotificationObserver,
- public ChromeViews::AcceleratorTarget,
public ChromeViews::FocusChangeListener,
public ChromeViews::HWNDViewContainer,
public AnimationDelegate {
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index 569ed3d..8c486c9 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/views/frame/browser_view2.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
#include "chrome/browser/tab_contents_container_view.h"
#include "chrome/browser/tabs/tab_strip.h"
#include "chrome/browser/view_ids.h"
@@ -62,9 +63,19 @@ BrowserView2::BrowserView2(Browser* browser)
toolbar_(NULL),
contents_container_(NULL),
initialized_(false) {
+ NotificationService::current()->AddObserver(
+ this,
+ NOTIFY_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
+ NotificationService::AllSources());
+ browser_->tabstrip_model()->AddObserver(this);
}
BrowserView2::~BrowserView2() {
+ browser_->tabstrip_model()->RemoveObserver(this);
+ NotificationService::current()->RemoveObserver(
+ this,
+ NOTIFY_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
+ NotificationService::AllSources());
}
gfx::Rect BrowserView2::GetToolbarBounds() const {
@@ -80,10 +91,65 @@ gfx::Rect BrowserView2::GetClientAreaBounds() const {
return gfx::Rect(bounds);
}
+bool BrowserView2::IsToolbarVisible() const {
+ return SupportsWindowFeature(FEATURE_TOOLBAR) ||
+ SupportsWindowFeature(FEATURE_LOCATIONBAR);
+}
+
+bool BrowserView2::IsTabStripVisible() const {
+ return SupportsWindowFeature(FEATURE_TABSTRIP);
+}
+
+bool BrowserView2::AcceleratorPressed(
+ const ChromeViews::Accelerator& accelerator) {
+ DCHECK(accelerator_table_.get());
+ std::map<ChromeViews::Accelerator, int>::const_iterator iter =
+ accelerator_table_->find(accelerator);
+ DCHECK(iter != accelerator_table_->end());
+
+ int command_id = iter->second;
+ if (browser_->SupportsCommand(command_id) &&
+ browser_->IsCommandEnabled(command_id)) {
+ browser_->ExecuteCommand(command_id);
+ return true;
+ }
+ return false;
+}
+
+bool BrowserView2::GetAccelerator(int cmd_id,
+ ChromeViews::Accelerator* accelerator) {
+ std::map<ChromeViews::Accelerator, int>::iterator it =
+ accelerator_table_->begin();
+ for (; it != accelerator_table_->end(); ++it) {
+ if (it->second == cmd_id) {
+ *accelerator = it->first;
+ return true;
+ }
+ }
+ return false;
+}
+
+bool BrowserView2::SupportsWindowFeature(WindowFeature feature) const {
+ return !!(FeaturesForBrowserType(browser_->GetType()) & feature);
+}
+
+// static
+unsigned int BrowserView2::FeaturesForBrowserType(BrowserType::Type type) {
+ unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF;
+ if (type == BrowserType::TABBED_BROWSER)
+ features |= FEATURE_TABSTRIP | FEATURE_TOOLBAR | FEATURE_BOOKMARKBAR;
+ if (type != BrowserType::APPLICATION)
+ features |= FEATURE_LOCATIONBAR;
+ if (type != BrowserType::TABBED_BROWSER)
+ features |= FEATURE_TITLEBAR;
+ return features;
+}
+
///////////////////////////////////////////////////////////////////////////////
// BrowserView2, BrowserWindow implementation:
void BrowserView2::Init() {
+ LoadAccelerators();
SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
tabstrip_ = new TabStrip(browser_->tabstrip_model());
@@ -179,8 +245,37 @@ void BrowserView2::ShowTabContents(TabContents* contents) {
}
void BrowserView2::ContinueDetachConstrainedWindowDrag(
- const gfx::Point& mouse_pt,
+ const gfx::Point& mouse_point,
int frame_component) {
+ HWND vc_hwnd = GetViewContainer()->GetHWND();
+ if (frame_component == HTCLIENT) {
+ // If the user's mouse was over the content area of the popup when they
+ // clicked down, we need to re-play the mouse down event so as to actually
+ // send the click to the renderer. If we don't do this, the user needs to
+ // click again once the window is detached to interact.
+ HWND inner_hwnd = browser_->GetSelectedTabContents()->GetContentHWND();
+ POINT window_point = mouse_point.ToPOINT();
+ MapWindowPoints(HWND_DESKTOP, inner_hwnd, &window_point, 1);
+ PostMessage(inner_hwnd, WM_LBUTTONDOWN, MK_LBUTTON,
+ MAKELPARAM(window_point.x, window_point.y));
+ } else if (frame_component != HTNOWHERE) {
+ // The user's mouse is already moving, and the left button is down, but we
+ // need to start moving this frame, so we _post_ it a NCLBUTTONDOWN message
+ // with the corresponding frame component as supplied by the constrained
+ // window where the user clicked. This tricks Windows into believing the
+ // user just started performing that operation on the newly created window.
+ // All the frame moving and sizing is then handled automatically by
+ // Windows. We use PostMessage because we need to return to the message
+ // loop first for Windows' built in moving/sizing to be triggered.
+ POINTS pts;
+ pts.x = mouse_point.x();
+ pts.y = mouse_point.y();
+ PostMessage(vc_hwnd, WM_NCLBUTTONDOWN, frame_component,
+ reinterpret_cast<LPARAM>(&pts));
+ // Also make sure the right cursor for the action is set.
+ PostMessage(vc_hwnd, WM_SETCURSOR, reinterpret_cast<WPARAM>(vc_hwnd),
+ frame_component);
+ }
}
void BrowserView2::SizeToContents(const gfx::Rect& contents_bounds) {
@@ -189,6 +284,7 @@ void BrowserView2::SizeToContents(const gfx::Rect& contents_bounds) {
void BrowserView2::SetAcceleratorTable(
std::map<ChromeViews::Accelerator, int>* accelerator_table) {
+ accelerator_table_.reset(accelerator_table);
}
void BrowserView2::ValidateThrobber() {
@@ -265,6 +361,81 @@ void BrowserView2::DestroyBrowser() {
}
///////////////////////////////////////////////////////////////////////////////
+// BrowserView2, NotificationObserver implementation:
+
+void BrowserView2::Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details) {
+ if (type == NOTIFY_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED) {
+ if (browser_->profile() == Source<Profile>(source).ptr() &&
+ MaybeShowBookmarkBar(browser_->GetSelectedTabContents())) {
+ Layout();
+ }
+ } else {
+ NOTREACHED() << "Got a notification we didn't register for!";
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// BrowserView2, TabStripModelObserver implementation:
+
+void BrowserView2::TabClosingAt(TabContents* contents, int index) {
+ if (contents == browser_->GetSelectedTabContents()) {
+ // TODO(beng): (Cleanup) These should probably eventually live in the
+ // TabContentsView, then we could skip all this teardown.
+ ChromeViews::View* shelf = contents->GetDownloadShelfView();
+ if (shelf && shelf->GetParent() != NULL)
+ shelf->GetParent()->RemoveChildView(shelf);
+
+ ChromeViews::View* info_bar = contents->GetInfoBarView();
+ if (info_bar && info_bar->GetParent() != NULL)
+ info_bar->GetParent()->RemoveChildView(info_bar);
+
+ // We need to reset the current tab contents to NULL before it gets
+ // freed. This is because the focus manager performs some operations
+ // on the selected TabContents when it is removed.
+ contents_container_->SetTabContents(NULL);
+ }
+}
+
+void BrowserView2::TabDetachedAt(TabContents* contents, int index) {
+ // TODO(beng): implement
+}
+
+void BrowserView2::TabSelectedAt(TabContents* old_contents,
+ TabContents* new_contents,
+ int index,
+ bool user_gesture) {
+ if (old_contents)
+ old_contents->StoreFocus();
+
+ // Tell the frame what happened so that the TabContents gets resized, etc.
+ contents_container_->SetTabContents(new_contents);
+
+ if (BrowserList::GetLastActive() == browser_)
+ new_contents->RestoreFocus();
+
+ /*
+ UpdateWindowTitle();
+ UpdateToolbar(true);
+ */
+
+ UpdateUIForContents(new_contents);
+}
+
+void BrowserView2::TabChangedAt(TabContents* old_contents,
+ TabContents* new_contents,
+ int index) {
+ UpdateUIForContents(new_contents);
+}
+
+void BrowserView2::TabStripEmpty() {
+ // We need to reset the frame contents just in case this wasn't done while
+ // detaching the tab. This happens when dragging out the last tab.
+ contents_container_->SetTabContents(NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////
// BrowserView2, ChromeViews::WindowDelegate implementation:
bool BrowserView2::CanResize() const {
@@ -288,7 +459,7 @@ ChromeViews::View* BrowserView2::GetInitiallyFocusedView() const {
}
bool BrowserView2::ShouldShowWindowTitle() const {
- return false;
+ return SupportsWindowFeature(FEATURE_TITLEBAR);
}
SkBitmap BrowserView2::GetWindowIcon() {
@@ -296,7 +467,7 @@ SkBitmap BrowserView2::GetWindowIcon() {
}
bool BrowserView2::ShouldShowWindowIcon() const {
- return false;
+ return SupportsWindowFeature(FEATURE_TITLEBAR);
}
void BrowserView2::ExecuteWindowsCommand(int command_id) {
@@ -394,8 +565,7 @@ int BrowserView2::NonClientHitTest(const gfx::Point& point) {
CPoint point_in_view_coords(point.ToPOINT());
View::ConvertPointToView(GetParent(), this, &point_in_view_coords);
- // TODO(beng): support IsTabStripVisible().
- if (/* IsTabStripVisible() && */tabstrip_->HitTest(point_in_view_coords) &&
+ if (IsTabStripVisible() && tabstrip_->HitTest(point_in_view_coords) &&
tabstrip_->CanProcessInputEvents()) {
ChromeViews::Window* window = frame_->GetWindow();
// The top few pixels of the TabStrip are a drop-shadow - as we're pretty
@@ -463,12 +633,15 @@ int BrowserView2::LayoutTabStrip() {
}
int BrowserView2::LayoutToolbar(int top) {
- CSize ps;
- toolbar_->GetPreferredSize(&ps);
- int toolbar_y = top - kToolbarTabStripVerticalOverlap;
- toolbar_->SetBounds(0, toolbar_y, GetWidth(), ps.cy);
- return toolbar_y + ps.cy;
- // TODO(beng): support toolbar-less windows.
+ if (IsToolbarVisible()) {
+ CSize ps;
+ toolbar_->GetPreferredSize(&ps);
+ int toolbar_y = top - kToolbarTabStripVerticalOverlap;
+ toolbar_->SetBounds(0, toolbar_y, GetWidth(), ps.cy);
+ return toolbar_y + ps.cy;
+ }
+ toolbar_->SetVisible(false);
+ return top;
}
int BrowserView2::LayoutBookmarkAndInfoBars(int top) {
@@ -489,7 +662,7 @@ int BrowserView2::LayoutBookmarkAndInfoBars(int top) {
}
int BrowserView2::LayoutBookmarkBar(int top) {
- if (active_bookmark_bar_) {
+ if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && active_bookmark_bar_) {
CSize ps;
active_bookmark_bar_->GetPreferredSize(&ps);
active_bookmark_bar_->SetBounds(0, top, GetWidth(), ps.cy);
@@ -498,7 +671,7 @@ int BrowserView2::LayoutBookmarkBar(int top) {
return top;
}
int BrowserView2::LayoutInfoBar(int top) {
- if (active_info_bar_) {
+ if (SupportsWindowFeature(FEATURE_INFOBAR) && active_info_bar_) {
CSize ps;
active_info_bar_->GetPreferredSize(&ps);
active_info_bar_->SetBounds(0, top, GetWidth(), ps.cy);
@@ -513,7 +686,7 @@ void BrowserView2::LayoutTabContents(int top, int bottom) {
int BrowserView2::LayoutDownloadShelf() {
int bottom = GetHeight();
- if (active_download_shelf_) {
+ if (SupportsWindowFeature(FEATURE_DOWNLOADSHELF) && active_download_shelf_) {
CSize ps;
active_download_shelf_->GetPreferredSize(&ps);
active_download_shelf_->SetBounds(0, bottom - ps.cy, GetWidth(), ps.cy);
@@ -529,31 +702,42 @@ void BrowserView2::LayoutStatusBubble(int top) {
GetWidth() / 3, kStatusBubbleHeight);
}
-void BrowserView2::UpdateUIForContents(TabContents* contents) {
- // Coalesce layouts.
- bool changed = false;
-
- ChromeViews::View* new_shelf = NULL;
- if (contents && contents->IsDownloadShelfVisible())
- new_shelf = contents->GetDownloadShelfView();
- changed |= UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
+bool BrowserView2::MaybeShowBookmarkBar(TabContents* contents) {
+ ChromeViews::View* new_bookmark_bar_view = NULL;
+ if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) &&
+ contents->IsBookmarkBarAlwaysVisible()) {
+ new_bookmark_bar_view = GetBookmarkBarView();
+ }
+ return UpdateChildViewAndLayout(new_bookmark_bar_view,
+ &active_bookmark_bar_);
+}
+bool BrowserView2::MaybeShowInfoBar(TabContents* contents) {
ChromeViews::View* new_info_bar = NULL;
if (contents && contents->IsInfoBarVisible())
new_info_bar = contents->GetInfoBarView();
- changed |= UpdateChildViewAndLayout(new_info_bar, &active_info_bar_);
+ return UpdateChildViewAndLayout(new_info_bar, &active_info_bar_);
+}
- ChromeViews::View* new_bookmark_bar = NULL;
- if (contents) // TODO(beng): check for support of BookmarkBar
- new_bookmark_bar = GetBookmarkBarView();
- changed |= UpdateChildViewAndLayout(new_bookmark_bar, &active_bookmark_bar_);
+bool BrowserView2::MaybeShowDownloadShelf(TabContents* contents) {
+ ChromeViews::View* new_shelf = NULL;
+ if (contents && contents->IsDownloadShelfVisible())
+ new_shelf = contents->GetDownloadShelfView();
+ return UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
+}
+void BrowserView2::UpdateUIForContents(TabContents* contents) {
// Only do a Layout if the current contents is non-NULL. We assume that if
// the contents is NULL, we're either being destroyed, or ShowTabContents is
// going to be invoked with a non-NULL TabContents again so that there is no
// need to do a Layout now.
- if (changed && contents)
+ if (!contents)
+ return;
+
+ if (MaybeShowBookmarkBar(contents) && MaybeShowInfoBar(contents) &&
+ MaybeShowDownloadShelf(contents)) {
Layout();
+ }
}
bool BrowserView2::UpdateChildViewAndLayout(ChromeViews::View* new_view,
@@ -608,3 +792,39 @@ bool BrowserView2::UpdateChildViewAndLayout(ChromeViews::View* new_view,
*old_view = new_view;
return changed;
}
+
+void BrowserView2::LoadAccelerators() {
+ HACCEL accelerator_table = AtlLoadAccelerators(IDR_MAINFRAME);
+ DCHECK(accelerator_table);
+
+ // We have to copy the table to access its contents.
+ int count = CopyAcceleratorTable(accelerator_table, 0, 0);
+ if (count == 0) {
+ // Nothing to do in that case.
+ return;
+ }
+
+ ACCEL* accelerators = static_cast<ACCEL*>(malloc(sizeof(ACCEL) * count));
+ CopyAcceleratorTable(accelerator_table, accelerators, count);
+
+ ChromeViews::FocusManager* focus_manager =
+ ChromeViews::FocusManager::GetFocusManager(GetViewContainer()->GetHWND());
+ DCHECK(focus_manager);
+
+ // Let's build our own accelerator table.
+ accelerator_table_.reset(new std::map<ChromeViews::Accelerator, int>);
+ for (int i = 0; i < count; ++i) {
+ bool alt_down = (accelerators[i].fVirt & FALT) == FALT;
+ bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
+ bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
+ ChromeViews::Accelerator accelerator(accelerators[i].key,
+ shift_down, ctrl_down, alt_down);
+ (*accelerator_table_)[accelerator] = accelerators[i].cmd;
+
+ // Also register with the focus manager.
+ focus_manager->RegisterAccelerator(accelerator, this);
+ }
+
+ // We don't need the Windows accelerator table anymore.
+ free(accelerators);
+}
diff --git a/chrome/browser/views/frame/browser_view2.h b/chrome/browser/views/frame/browser_view2.h
index c643d6a..54e3fa6 100644
--- a/chrome/browser/views/frame/browser_view2.h
+++ b/chrome/browser/views/frame/browser_view2.h
@@ -30,7 +30,9 @@
#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW2_H_
#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW2_H_
+#include "chrome/browser/browser_type.h"
#include "chrome/browser/browser_window.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/views/frame/browser_frame.h"
#include "chrome/views/client_view.h"
#include "chrome/views/window_delegate.h"
@@ -51,6 +53,8 @@ class TabContentsContainerView;
// including the TabStrip, toolbars, download shelves, the content area etc.
//
class BrowserView2 : public BrowserWindow,
+ public NotificationObserver,
+ public TabStripModelObserver,
public ChromeViews::WindowDelegate,
public ChromeViews::ClientView {
public:
@@ -66,6 +70,37 @@ class BrowserView2 : public BrowserWindow,
// BrowserView2's parent.
gfx::Rect GetClientAreaBounds() const;
+ // Returns true if various window components are visible.
+ bool IsToolbarVisible() const;
+ bool IsTabStripVisible() const;
+
+ // Handle the specified |accelerator| being pressed.
+ bool AcceleratorPressed(const ChromeViews::Accelerator& accelerator);
+
+ // Provides the containing frame with the accelerator for the specified
+ // command id. This can be used to provide menu item shortcut hints etc.
+ // Returns true if an accelerator was found for the specified |cmd_id|, false
+ // otherwise.
+ bool GetAccelerator(int cmd_id, ChromeViews::Accelerator* accelerator);
+
+ // Possible elements of the Browser window.
+ enum WindowFeature {
+ FEATURE_TITLEBAR = 1,
+ FEATURE_TABSTRIP = 2,
+ FEATURE_TOOLBAR = 4,
+ FEATURE_LOCATIONBAR = 8,
+ FEATURE_BOOKMARKBAR = 16,
+ FEATURE_INFOBAR = 32,
+ FEATURE_DOWNLOADSHELF = 64
+ };
+
+ // Returns true if the Browser object associated with this BrowserView2
+ // supports the specified feature.
+ bool SupportsWindowFeature(WindowFeature feature) const;
+
+ // Returns the set of WindowFeatures supported by the specified BrowserType.
+ static unsigned int FeaturesForBrowserType(BrowserType::Type type);
+
// Overridden from BrowserWindow:
virtual void Init();
virtual void Show(int command, bool adjust_to_fit);
@@ -83,7 +118,7 @@ class BrowserView2 : public BrowserWindow,
virtual void FlashFrame();
virtual void ShowTabContents(TabContents* contents);
virtual void ContinueDetachConstrainedWindowDrag(
- const gfx::Point& mouse_pt,
+ const gfx::Point& mouse_point,
int frame_component);
virtual void SizeToContents(const gfx::Rect& contents_bounds);
virtual void SetAcceleratorTable(
@@ -105,6 +140,23 @@ class BrowserView2 : public BrowserWindow,
virtual void FocusToolbar();
virtual void DestroyBrowser();
+ // Overridden from NotificationObserver:
+ virtual void Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details);
+
+ // Overridden from TabStripModelObserver:
+ virtual void TabClosingAt(TabContents* contents, int index);
+ virtual void TabDetachedAt(TabContents* contents, int index);
+ virtual void TabSelectedAt(TabContents* old_contents,
+ TabContents* new_contents,
+ int index,
+ bool user_gesture);
+ virtual void TabChangedAt(TabContents* old_contents,
+ TabContents* new_contents,
+ int index);
+ virtual void TabStripEmpty();
+
// Overridden from ChromeViews::WindowDelegate:
virtual bool CanResize() const;
virtual bool CanMaximize() const;
@@ -156,6 +208,21 @@ class BrowserView2 : public BrowserWindow,
// Layout the Status Bubble.
void LayoutStatusBubble(int top);
+ // Prepare to show the Bookmark Bar for the specified TabContents. Returns
+ // true if the Bookmark Bar can be shown (i.e. it's supported for this
+ // Browser type) and there should be a subsequent re-layout to show it.
+ bool MaybeShowBookmarkBar(TabContents* contents);
+
+ // Prepare to show an Info Bar for the specified TabContents. Returns true
+ // if there is an Info Bar to show and one is supported for this Browser
+ // type, and there should be a subsequent re-layout to show it.
+ bool MaybeShowInfoBar(TabContents* contents);
+
+ // Prepare to show a Download Shelf for the specified TabContents. Returns
+ // true if there is a Download Shelf to show and one is supported for this
+ // Browser type, and there should be a subsequent re-layout to show it.
+ bool MaybeShowDownloadShelf(TabContents* contents);
+
// Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the
// Download Shelf in response to a change notification from the specified
// |contents|.
@@ -169,6 +236,10 @@ class BrowserView2 : public BrowserWindow,
bool UpdateChildViewAndLayout(ChromeViews::View* new_view,
ChromeViews::View** old_view);
+ // Copy the accelerator table from the app resources into something we can
+ // use.
+ void LoadAccelerators();
+
// The BrowserFrame that hosts this view.
BrowserFrame* frame_;
@@ -195,6 +266,9 @@ class BrowserView2 : public BrowserWindow,
// The Status information bubble that appears at the bottom of the window.
scoped_ptr<StatusBubble> status_bubble_;
+ // A mapping between accelerators and commands.
+ scoped_ptr<std::map<ChromeViews::Accelerator, int>> accelerator_table_;
+
// True if we have already been initialized.
bool initialized_;
diff --git a/chrome/browser/views/frame/opaque_frame.cc b/chrome/browser/views/frame/opaque_frame.cc
index 64794c1..0d33c45 100644
--- a/chrome/browser/views/frame/opaque_frame.cc
+++ b/chrome/browser/views/frame/opaque_frame.cc
@@ -78,9 +78,22 @@ ChromeViews::Window* OpaqueFrame::GetWindow() {
}
///////////////////////////////////////////////////////////////////////////////
+// OpaqueFrame, ChromeViews::HWNDViewContainer overrides:
+
+bool OpaqueFrame::AcceleratorPressed(ChromeViews::Accelerator* accelerator) {
+ return browser_view_->AcceleratorPressed(*accelerator);
+}
+
+bool OpaqueFrame::GetAccelerator(int cmd_id,
+ ChromeViews::Accelerator* accelerator) {
+ return browser_view_->GetAccelerator(cmd_id, accelerator);
+}
+
+///////////////////////////////////////////////////////////////////////////////
// OpaqueFrame, private:
OpaqueNonClientView* OpaqueFrame::GetOpaqueNonClientView() const {
// We can safely assume that this conversion is true.
return static_cast<OpaqueNonClientView*>(non_client_view_);
}
+
diff --git a/chrome/browser/views/frame/opaque_frame.h b/chrome/browser/views/frame/opaque_frame.h
index a8e31b0..ddd1c77 100644
--- a/chrome/browser/views/frame/opaque_frame.h
+++ b/chrome/browser/views/frame/opaque_frame.h
@@ -68,6 +68,11 @@ class OpaqueFrame : public BrowserFrame,
virtual gfx::Rect GetBoundsForTabStrip(TabStrip* tabstrip) const;
virtual ChromeViews::Window* GetWindow();
+ // Overridden from ChromeViews::HWNDViewContainer:
+ virtual bool AcceleratorPressed(ChromeViews::Accelerator* accelerator);
+ virtual bool GetAccelerator(int cmd_id,
+ ChromeViews::Accelerator* accelerator);
+
private:
// Return a pointer to the concrete type of our non-client view.
OpaqueNonClientView* GetOpaqueNonClientView() const;
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index 8678428..adb46c7 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -55,7 +55,6 @@ class InfoBubbleDelegate {
};
class InfoBubble : public ChromeViews::HWNDViewContainer,
- public ChromeViews::AcceleratorTarget,
public AnimationDelegate {
public:
// Shows the InfoBubble. The InfoBubble is parented to parent_hwnd, contains
diff --git a/chrome/views/hwnd_view_container.h b/chrome/views/hwnd_view_container.h
index c420e42..aa3a4a9 100644
--- a/chrome/views/hwnd_view_container.h
+++ b/chrome/views/hwnd_view_container.h
@@ -96,7 +96,8 @@ class FillLayout : public LayoutManager {
///////////////////////////////////////////////////////////////////////////////
class HWNDViewContainer : public ViewContainer,
public MessageLoop::Observer,
- public FocusTraversable {
+ public FocusTraversable,
+ public AcceleratorTarget {
public:
HWNDViewContainer();
virtual ~HWNDViewContainer();
@@ -257,6 +258,11 @@ class HWNDViewContainer : public ViewContainer,
virtual FocusTraversable* GetFocusTraversableParent();
virtual View* GetFocusTraversableParentView();
+ // Overridden from AcceleratorTarget:
+ virtual bool AcceleratorPressed(const Accelerator& accelerator) {
+ return false;
+ }
+
void SetFocusTraversableParent(FocusTraversable* parent);
void SetFocusTraversableParentView(View* parent_view);
generated by cgit v1.1 at 2025-03-09 21:32:56 +0000