summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/aero_glass_frame.cc4
-rw-r--r--chrome/browser/views/frame/aero_glass_frame.h4
-rw-r--r--chrome/browser/views/frame/aero_glass_non_client_view.cc4
-rw-r--r--chrome/browser/views/frame/browser_view.cc6
-rw-r--r--chrome/browser/views/frame/browser_view2.cc12
-rw-r--r--chrome/browser/views/frame/opaque_frame.cc2
-rw-r--r--chrome/browser/views/frame/opaque_frame.h2
-rw-r--r--chrome/browser/views/frame/opaque_non_client_view.cc2
8 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/views/frame/aero_glass_frame.cc b/chrome/browser/views/frame/aero_glass_frame.cc
index cb86728..7810cac 100644
--- a/chrome/browser/views/frame/aero_glass_frame.cc
+++ b/chrome/browser/views/frame/aero_glass_frame.cc
@@ -91,7 +91,7 @@ ChromeViews::Window* AeroGlassFrame::GetWindow() {
}
///////////////////////////////////////////////////////////////////////////////
-// AeroGlassFrame, ChromeViews::HWNDViewContainer implementation:
+// AeroGlassFrame, ChromeViews::ContainerWin implementation:
void AeroGlassFrame::OnInitMenuPopup(HMENU menu, UINT position,
BOOL is_system_menu) {
@@ -183,7 +183,7 @@ LRESULT AeroGlassFrame::OnNCHitTest(const CPoint& pt) {
}
///////////////////////////////////////////////////////////////////////////////
-// AeroGlassFrame, ChromeViews::HWNDViewContainer overrides:
+// AeroGlassFrame, ChromeViews::ContainerWin overrides:
bool AeroGlassFrame::AcceleratorPressed(
ChromeViews::Accelerator* accelerator) {
diff --git a/chrome/browser/views/frame/aero_glass_frame.h b/chrome/browser/views/frame/aero_glass_frame.h
index a649eef..ccdec53 100644
--- a/chrome/browser/views/frame/aero_glass_frame.h
+++ b/chrome/browser/views/frame/aero_glass_frame.h
@@ -38,13 +38,13 @@ class AeroGlassFrame : public BrowserFrame,
virtual void UpdateThrobber(bool running);
virtual ChromeViews::Window* GetWindow();
- // Overridden from ChromeViews::HWNDViewContainer:
+ // Overridden from ChromeViews::ContainerWin:
virtual bool AcceleratorPressed(ChromeViews::Accelerator* accelerator);
virtual bool GetAccelerator(int cmd_id,
ChromeViews::Accelerator* accelerator);
protected:
- // Overridden from ChromeViews::HWNDViewContainer:
+ // Overridden from ChromeViews::ContainerWin:
virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu);
virtual void OnEndSession(BOOL ending, UINT logoff);
virtual void OnExitMenuLoop(bool is_track_popup_menu);
diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc
index 74de8bb..5155634 100644
--- a/chrome/browser/views/frame/aero_glass_non_client_view.cc
+++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc
@@ -181,7 +181,7 @@ gfx::Size AeroGlassNonClientView::CalculateWindowSizeForClientSize(
CPoint AeroGlassNonClientView::GetSystemMenuPoint() const {
CPoint offset(0, 0);
- MapWindowPoints(GetViewContainer()->GetHWND(), HWND_DESKTOP, &offset, 1);
+ MapWindowPoints(GetContainer()->GetHWND(), HWND_DESKTOP, &offset, 1);
return offset;
}
@@ -259,7 +259,7 @@ void AeroGlassNonClientView::ViewHierarchyChanged(bool is_add,
ChromeViews::View* parent,
ChromeViews::View* child) {
if (is_add && child == this) {
- DCHECK(GetViewContainer());
+ DCHECK(GetContainer());
DCHECK(frame_->client_view()->GetParent() != this);
AddChildView(frame_->client_view());
}
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 71b82c4..5a8b495 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -61,7 +61,7 @@ void BrowserView::Init() {
toolbar_->Init(browser_->profile());
toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
- status_bubble_.reset(new StatusBubble(GetViewContainer()));
+ status_bubble_.reset(new StatusBubble(GetContainer()));
}
void BrowserView::Show(int command, bool adjust_to_fit) {
@@ -228,10 +228,10 @@ void BrowserView::DidChangeBounds(const CRect& previous,
void BrowserView::ViewHierarchyChanged(bool is_add,
ChromeViews::View* parent,
ChromeViews::View* child) {
- if (is_add && child == this && GetViewContainer() && !initialized_) {
+ if (is_add && child == this && GetContainer() && !initialized_) {
Init();
// Make sure not to call Init() twice if we get inserted into a different
- // ViewContainer.
+ // Container.
initialized_ = true;
}
}
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index b5c4ee7..7ee9567 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -272,7 +272,7 @@ unsigned int BrowserView2::FeaturesForBrowserType(BrowserType::Type type) {
void BrowserView2::Init() {
// Stow a pointer to this object onto the window handle so that we can get
// at it later when all we have is a HWND.
- SetProp(GetViewContainer()->GetHWND(), kBrowserWindowKey, this);
+ SetProp(GetContainer()->GetHWND(), kBrowserWindowKey, this);
LoadAccelerators();
SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
@@ -291,7 +291,7 @@ void BrowserView2::Init() {
set_contents_view(contents_container_);
AddChildView(contents_container_);
- status_bubble_.reset(new StatusBubble(GetViewContainer()));
+ status_bubble_.reset(new StatusBubble(GetContainer()));
#ifdef CHROME_PERSONALIZATION
EnablePersonalization(CommandLine().HasSwitch(switches::kEnableP13n));
@@ -311,7 +311,7 @@ void BrowserView2::Close() {
}
void* BrowserView2::GetPlatformID() {
- return GetViewContainer()->GetHWND();
+ return GetContainer()->GetHWND();
}
TabStrip* BrowserView2::GetTabStrip() const {
@@ -356,7 +356,7 @@ void BrowserView2::FlashFrame() {
void BrowserView2::ContinueDetachConstrainedWindowDrag(
const gfx::Point& mouse_point,
int frame_component) {
- HWND vc_hwnd = GetViewContainer()->GetHWND();
+ HWND vc_hwnd = GetContainer()->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
@@ -789,7 +789,7 @@ void BrowserView2::DidChangeBounds(const CRect& previous,
void BrowserView2::ViewHierarchyChanged(bool is_add,
ChromeViews::View* parent,
ChromeViews::View* child) {
- if (is_add && child == this && GetViewContainer() && !initialized_) {
+ if (is_add && child == this && GetContainer() && !initialized_) {
Init();
initialized_ = true;
}
@@ -1072,7 +1072,7 @@ void BrowserView2::LoadAccelerators() {
CopyAcceleratorTable(accelerator_table, accelerators, count);
ChromeViews::FocusManager* focus_manager =
- ChromeViews::FocusManager::GetFocusManager(GetViewContainer()->GetHWND());
+ ChromeViews::FocusManager::GetFocusManager(GetContainer()->GetHWND());
DCHECK(focus_manager);
// Let's build our own accelerator table.
diff --git a/chrome/browser/views/frame/opaque_frame.cc b/chrome/browser/views/frame/opaque_frame.cc
index 97b9566..9bf52a3 100644
--- a/chrome/browser/views/frame/opaque_frame.cc
+++ b/chrome/browser/views/frame/opaque_frame.cc
@@ -63,7 +63,7 @@ void OpaqueFrame::UpdateWindowIcon() {
}
///////////////////////////////////////////////////////////////////////////////
-// OpaqueFrame, ChromeViews::HWNDViewContainer overrides:
+// OpaqueFrame, ChromeViews::ContainerWin overrides:
bool OpaqueFrame::AcceleratorPressed(ChromeViews::Accelerator* accelerator) {
return browser_view_->AcceleratorPressed(*accelerator);
diff --git a/chrome/browser/views/frame/opaque_frame.h b/chrome/browser/views/frame/opaque_frame.h
index a30b855..f40f1a8 100644
--- a/chrome/browser/views/frame/opaque_frame.h
+++ b/chrome/browser/views/frame/opaque_frame.h
@@ -41,7 +41,7 @@ class OpaqueFrame : public BrowserFrame,
// Overridden from ChromeViews::CustomFrameWindow:
virtual void UpdateWindowIcon();
- // Overridden from ChromeViews::HWNDViewContainer:
+ // Overridden from ChromeViews::ContainerWin:
virtual bool AcceleratorPressed(ChromeViews::Accelerator* accelerator);
virtual bool GetAccelerator(int cmd_id,
ChromeViews::Accelerator* accelerator);
diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc
index 1bbbbfd..72b2215 100644
--- a/chrome/browser/views/frame/opaque_non_client_view.cc
+++ b/chrome/browser/views/frame/opaque_non_client_view.cc
@@ -660,7 +660,7 @@ void OpaqueNonClientView::ViewHierarchyChanged(bool is_add,
ChromeViews::View* parent,
ChromeViews::View* child) {
if (is_add && child == this) {
- DCHECK(GetViewContainer());
+ DCHECK(GetContainer());
DCHECK(frame_->client_view()->GetParent() != this);
AddChildView(frame_->client_view());
generated by cgit v1.1 at 2025-10-13 19:01:56 +0000