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

Side by Side Diff: chrome/browser/ui/views/panels/panel_stack_view.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/panels/panel_stack_view.h" 5 #include "chrome/browser/ui/views/panels/panel_stack_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/panels/panel.h" 10 #include "chrome/browser/ui/panels/panel.h"
(...skipping 19 matching lines...) Expand all
30 30
31 // The widget window that acts as a background window for the stack of panels. 31 // The widget window that acts as a background window for the stack of panels.
32 class PanelStackWindow : public views::WidgetObserver, 32 class PanelStackWindow : public views::WidgetObserver,
33 public views::WidgetDelegateView { 33 public views::WidgetDelegateView {
34 public: 34 public:
35 PanelStackWindow(const gfx::Rect& bounds, 35 PanelStackWindow(const gfx::Rect& bounds,
36 NativePanelStackWindowDelegate* delegate); 36 NativePanelStackWindowDelegate* delegate);
37 virtual ~PanelStackWindow(); 37 virtual ~PanelStackWindow();
38 38
39 // Overridden from views::WidgetDelegate: 39 // Overridden from views::WidgetDelegate:
40 virtual base::string16 GetWindowTitle() const OVERRIDE; 40 virtual base::string16 GetWindowTitle() const override;
41 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; 41 virtual gfx::ImageSkia GetWindowAppIcon() override;
42 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 42 virtual gfx::ImageSkia GetWindowIcon() override;
43 virtual views::Widget* GetWidget() OVERRIDE; 43 virtual views::Widget* GetWidget() override;
44 virtual const views::Widget* GetWidget() const OVERRIDE; 44 virtual const views::Widget* GetWidget() const override;
45 45
46 // Overridden from views::WidgetObserver: 46 // Overridden from views::WidgetObserver:
47 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 47 virtual void OnWidgetClosing(views::Widget* widget) override;
48 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 48 virtual void OnWidgetDestroying(views::Widget* widget) override;
49 49
50 private: 50 private:
51 views::Widget* window_; // Weak pointer, own us. 51 views::Widget* window_; // Weak pointer, own us.
52 NativePanelStackWindowDelegate* delegate_; // Weak pointer. 52 NativePanelStackWindowDelegate* delegate_; // Weak pointer.
53 53
54 DISALLOW_COPY_AND_ASSIGN(PanelStackWindow); 54 DISALLOW_COPY_AND_ASSIGN(PanelStackWindow);
55 }; 55 };
56 56
57 PanelStackWindow::PanelStackWindow(const gfx::Rect& bounds, 57 PanelStackWindow::PanelStackWindow(const gfx::Rect& bounds,
58 NativePanelStackWindowDelegate* delegate) 58 NativePanelStackWindowDelegate* delegate)
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 ::DeferWindowPos(defer_window_pos_info, 581 ::DeferWindowPos(defer_window_pos_info,
582 views::HWNDForWidget(window), 582 views::HWNDForWidget(window),
583 NULL, 583 NULL,
584 bounds.x(), 584 bounds.x(),
585 bounds.y(), 585 bounds.y(),
586 bounds.width(), 586 bounds.width(),
587 bounds.height(), 587 bounds.height(),
588 SWP_NOACTIVATE | SWP_NOZORDER); 588 SWP_NOACTIVATE | SWP_NOZORDER);
589 } 589 }
590 #endif 590 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/panels/panel_stack_view.h ('k') | chrome/browser/ui/views/panels/panel_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698