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

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer_common_unittest.h

Issue 629463003: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[w-z]* (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 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_ 5 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_
6 #define CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_ 6 #define CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ui::WindowShowState show_state, 59 ui::WindowShowState show_state,
60 bool has_persistent_data); 60 bool has_persistent_data);
61 void SetLastActiveState(const gfx::Rect& bounds, 61 void SetLastActiveState(const gfx::Rect& bounds,
62 ui::WindowShowState show_state, 62 ui::WindowShowState show_state,
63 bool has_last_active_data); 63 bool has_last_active_data);
64 64
65 // Overridden from WindowSizer::StateProvider: 65 // Overridden from WindowSizer::StateProvider:
66 virtual bool GetPersistentState( 66 virtual bool GetPersistentState(
67 gfx::Rect* bounds, 67 gfx::Rect* bounds,
68 gfx::Rect* saved_work_area, 68 gfx::Rect* saved_work_area,
69 ui::WindowShowState* show_state) const OVERRIDE; 69 ui::WindowShowState* show_state) const override;
70 virtual bool GetLastActiveWindowState( 70 virtual bool GetLastActiveWindowState(
71 gfx::Rect* bounds, 71 gfx::Rect* bounds,
72 ui::WindowShowState* show_state) const OVERRIDE; 72 ui::WindowShowState* show_state) const override;
73 73
74 private: 74 private:
75 gfx::Rect persistent_bounds_; 75 gfx::Rect persistent_bounds_;
76 gfx::Rect persistent_work_area_; 76 gfx::Rect persistent_work_area_;
77 bool has_persistent_data_; 77 bool has_persistent_data_;
78 ui::WindowShowState persistent_show_state_; 78 ui::WindowShowState persistent_show_state_;
79 79
80 gfx::Rect last_active_bounds_; 80 gfx::Rect last_active_bounds_;
81 bool has_last_active_data_; 81 bool has_last_active_data_;
82 ui::WindowShowState last_active_show_state_; 82 ui::WindowShowState last_active_show_state_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // |source|. The |display_config| is the primary display configuration used. 130 // |source|. The |display_config| is the primary display configuration used.
131 ui::WindowShowState GetWindowShowState( 131 ui::WindowShowState GetWindowShowState(
132 ui::WindowShowState show_state_persisted, 132 ui::WindowShowState show_state_persisted,
133 ui::WindowShowState show_state_last, 133 ui::WindowShowState show_state_last,
134 Source source, 134 Source source,
135 const Browser* browser, 135 const Browser* browser,
136 const gfx::Rect& bounds, 136 const gfx::Rect& bounds,
137 const gfx::Rect& display_config); 137 const gfx::Rect& display_config);
138 138
139 #endif // CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_ 139 #endif // CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698