diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 04:48:39 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 04:48:39 +0000 |
| commit | f3e99e3d1dd8d37c7d0e37daa24df7717cd7783b (patch) | |
| tree | 4d46a6020077f2385a8720882e76158ce878f432 /chrome/browser/vista_frame.cc | |
| parent | 43a973aeb04b5d0ac64bb730cadf0737de8b0cd9 (diff) | |
| download | chromium_src-f3e99e3d1dd8d37c7d0e37daa24df7717cd7783b.zip chromium_src-f3e99e3d1dd8d37c7d0e37daa24df7717cd7783b.tar.gz chromium_src-f3e99e3d1dd8d37c7d0e37daa24df7717cd7783b.tar.bz2 | |
Rename ChromeFrame->BrowserWindow
Move static utility functions to FrameUtil class.
B=1294302
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/vista_frame.cc')
| -rw-r--r-- | chrome/browser/vista_frame.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/vista_frame.cc b/chrome/browser/vista_frame.cc index c804400..e437d33 100644 --- a/chrome/browser/vista_frame.cc +++ b/chrome/browser/vista_frame.cc @@ -42,6 +42,7 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" +#include "chrome/browser/frame_util.h" #include "chrome/browser/suspend_controller.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/tab_contents_container_view.h" @@ -386,12 +387,12 @@ void VistaFrame::Layout() { //////////////////////////////////////////////////////////////////////////////// // -// ChromeFrame implementation +// BrowserWindow implementation // //////////////////////////////////////////////////////////////////////////////// void VistaFrame::Init() { - ChromeFrame::RegisterChromeFrame(this); + FrameUtil::RegisterBrowserWindow(this); // Link the HWND with its root view so we can retrieve the RootView from the // HWND for automation purposes. @@ -456,7 +457,7 @@ void VistaFrame::Init() { // Register accelerators. HACCEL accelerators_table = AtlLoadAccelerators(IDR_MAINFRAME); DCHECK(accelerators_table); - ChromeFrame::LoadAccelerators(this, accelerators_table, this); + FrameUtil::LoadAccelerators(this, accelerators_table, this); ShelfVisibilityChanged(); root_view_.OnViewContainerCreated(); @@ -482,7 +483,7 @@ void VistaFrame::BrowserDidPaint(HRGN region) { // not pump the final messages. void VistaFrame::OnEndSession(BOOL ending, UINT logoff) { tabstrip_->AbortActiveDragSession(); - EndSession(); + FrameUtil::EndSession(); } // Note: called directly by the handler macros to handle WM_CLOSE messages. @@ -656,7 +657,7 @@ BOOL VistaFrame::OnPowerBroadcast(DWORD power_event, DWORD data) { void VistaFrame::OnThemeChanged() { // Notify NativeTheme. gfx::NativeTheme::instance()->CloseHandles(); - ChromeFrame::NotifyTabsOfThemeChange(browser_); + FrameUtil::NotifyTabsOfThemeChange(browser_); } void VistaFrame::OnMouseButtonDown(UINT flags, const CPoint& pt) { @@ -1000,7 +1001,7 @@ LRESULT VistaFrame::OnNCHitTest(const CPoint& pt) { } void VistaFrame::OnActivate(UINT n_state, BOOL is_minimized, HWND other) { - if (ActivateAppModalDialog(browser_)) + if (FrameUtil::ActivateAppModalDialog(browser_)) return; // Enable our custom window if we haven't already (this works in combination @@ -1029,7 +1030,8 @@ void VistaFrame::OnActivate(UINT n_state, BOOL is_minimized, HWND other) { int VistaFrame::OnMouseActivate(CWindow wndTopLevel, UINT nHitTest, UINT message) { - return ActivateAppModalDialog(browser_) ? MA_NOACTIVATEANDEAT : MA_ACTIVATE; + return FrameUtil::ActivateAppModalDialog(browser_) ? MA_NOACTIVATEANDEAT + : MA_ACTIVATE; } void VistaFrame::OnPaint(HDC dc) { |