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

Side by Side Diff: chrome/browser/ui/panels/base_panel_browser_test.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/panels/base_panel_browser_test.h" 5 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 int thickness; 58 int thickness;
59 }; 59 };
60 60
61 class MockDisplaySettingsProviderImpl : 61 class MockDisplaySettingsProviderImpl :
62 public BasePanelBrowserTest::MockDisplaySettingsProvider { 62 public BasePanelBrowserTest::MockDisplaySettingsProvider {
63 public: 63 public:
64 explicit MockDisplaySettingsProviderImpl(); 64 explicit MockDisplaySettingsProviderImpl();
65 virtual ~MockDisplaySettingsProviderImpl() { } 65 virtual ~MockDisplaySettingsProviderImpl() { }
66 66
67 // Overridden from DisplaySettingsProvider: 67 // Overridden from DisplaySettingsProvider:
68 virtual gfx::Rect GetPrimaryDisplayArea() const OVERRIDE; 68 virtual gfx::Rect GetPrimaryDisplayArea() const override;
69 virtual gfx::Rect GetPrimaryWorkArea() const OVERRIDE; 69 virtual gfx::Rect GetPrimaryWorkArea() const override;
70 virtual gfx::Rect GetDisplayAreaMatching( 70 virtual gfx::Rect GetDisplayAreaMatching(
71 const gfx::Rect& bounds) const OVERRIDE; 71 const gfx::Rect& bounds) const override;
72 virtual gfx::Rect GetWorkAreaMatching( 72 virtual gfx::Rect GetWorkAreaMatching(
73 const gfx::Rect& bounds) const OVERRIDE; 73 const gfx::Rect& bounds) const override;
74 virtual bool IsAutoHidingDesktopBarEnabled( 74 virtual bool IsAutoHidingDesktopBarEnabled(
75 DesktopBarAlignment alignment) OVERRIDE; 75 DesktopBarAlignment alignment) override;
76 virtual int GetDesktopBarThickness( 76 virtual int GetDesktopBarThickness(
77 DesktopBarAlignment alignment) const OVERRIDE; 77 DesktopBarAlignment alignment) const override;
78 virtual DesktopBarVisibility GetDesktopBarVisibility( 78 virtual DesktopBarVisibility GetDesktopBarVisibility(
79 DesktopBarAlignment alignment) const OVERRIDE; 79 DesktopBarAlignment alignment) const override;
80 virtual bool IsFullScreen() OVERRIDE; 80 virtual bool IsFullScreen() override;
81 81
82 // Overridden from MockDisplaySettingsProvider: 82 // Overridden from MockDisplaySettingsProvider:
83 virtual void SetPrimaryDisplay( 83 virtual void SetPrimaryDisplay(
84 const gfx::Rect& display_area, const gfx::Rect& work_area) OVERRIDE; 84 const gfx::Rect& display_area, const gfx::Rect& work_area) override;
85 virtual void SetSecondaryDisplay( 85 virtual void SetSecondaryDisplay(
86 const gfx::Rect& display_area, const gfx::Rect& work_area) OVERRIDE; 86 const gfx::Rect& display_area, const gfx::Rect& work_area) override;
87 virtual void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment, 87 virtual void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment,
88 bool enabled, 88 bool enabled,
89 int thickness) OVERRIDE; 89 int thickness) override;
90 virtual void SetDesktopBarVisibility( 90 virtual void SetDesktopBarVisibility(
91 DesktopBarAlignment alignment, DesktopBarVisibility visibility) OVERRIDE; 91 DesktopBarAlignment alignment, DesktopBarVisibility visibility) override;
92 virtual void SetDesktopBarThickness(DesktopBarAlignment alignment, 92 virtual void SetDesktopBarThickness(DesktopBarAlignment alignment,
93 int thickness) OVERRIDE; 93 int thickness) override;
94 virtual void EnableFullScreenMode(bool enabled) OVERRIDE; 94 virtual void EnableFullScreenMode(bool enabled) override;
95 95
96 private: 96 private:
97 gfx::Rect primary_display_area_; 97 gfx::Rect primary_display_area_;
98 gfx::Rect primary_work_area_; 98 gfx::Rect primary_work_area_;
99 gfx::Rect secondary_display_area_; 99 gfx::Rect secondary_display_area_;
100 gfx::Rect secondary_work_area_; 100 gfx::Rect secondary_work_area_;
101 MockDesktopBar mock_desktop_bars[3]; 101 MockDesktopBar mock_desktop_bars[3];
102 bool full_screen_enabled_; 102 bool full_screen_enabled_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(MockDisplaySettingsProviderImpl); 104 DISALLOW_COPY_AND_ASSIGN(MockDisplaySettingsProviderImpl);
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 } 597 }
598 598
599 std::string BasePanelBrowserTest::MakePanelName(int index) { 599 std::string BasePanelBrowserTest::MakePanelName(int index) {
600 std::string panel_name("Panel"); 600 std::string panel_name("Panel");
601 return panel_name + base::IntToString(index); 601 return panel_name + base::IntToString(index);
602 } 602 }
603 603
604 bool BasePanelBrowserTest::WmSupportWindowActivation() { 604 bool BasePanelBrowserTest::WmSupportWindowActivation() {
605 return true; 605 return true;
606 } 606 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.h ('k') | chrome/browser/ui/panels/detached_panel_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698