Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: chrome/browser/views/frame/aero_glass_frame.cc

Issue 10896: Re-do the way browser windows are shown:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/frame/aero_glass_frame.cc
===================================================================
--- chrome/browser/views/frame/aero_glass_frame.cc (revision 5374)
+++ chrome/browser/views/frame/aero_glass_frame.cc (working copy)
@@ -45,8 +45,8 @@
AeroGlassFrame::~AeroGlassFrame() {
}
-void AeroGlassFrame::Init(const gfx::Rect& bounds) {
- Window::Init(NULL, bounds);
+void AeroGlassFrame::Init() {
+ Window::Init(NULL, gfx::Rect());
}
int AeroGlassFrame::GetMinimizeButtonOffset() const {
@@ -91,8 +91,17 @@
}
///////////////////////////////////////////////////////////////////////////////
-// AeroGlassFrame, views::ContainerWin implementation:
+// AeroGlassFrame, views::ContainerWin overrides:
+bool AeroGlassFrame::AcceleratorPressed(views::Accelerator* accelerator) {
+ return browser_view_->AcceleratorPressed(*accelerator);
+}
+
+bool AeroGlassFrame::GetAccelerator(int cmd_id,
+ views::Accelerator* accelerator) {
+ return browser_view_->GetAccelerator(cmd_id, accelerator);
+}
+
void AeroGlassFrame::OnInitMenuPopup(HMENU menu, UINT position,
BOOL is_system_menu) {
browser_view_->PrepareToRunSystemMenu(menu);
@@ -179,17 +188,12 @@
}
///////////////////////////////////////////////////////////////////////////////
-// AeroGlassFrame, views::ContainerWin overrides:
+// AeroGlassFrame, views::CustomFrameWindow overrides:
-bool AeroGlassFrame::AcceleratorPressed(views::Accelerator* accelerator) {
- return browser_view_->AcceleratorPressed(*accelerator);
+int AeroGlassFrame::GetShowState() const {
+ return browser_view_->GetShowState();
}
-bool AeroGlassFrame::GetAccelerator(int cmd_id,
- views::Accelerator* accelerator) {
- return browser_view_->GetAccelerator(cmd_id, accelerator);
-}
-
///////////////////////////////////////////////////////////////////////////////
// AeroGlassFrame, private:

Powered by Google App Engine
This is Rietveld 408576698