OLD | NEW |
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/window_sizer/window_sizer.h" | 5 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 private: | 168 private: |
169 DISALLOW_COPY_AND_ASSIGN(DefaultTargetDisplayProvider); | 169 DISALLOW_COPY_AND_ASSIGN(DefaultTargetDisplayProvider); |
170 }; | 170 }; |
171 | 171 |
172 } // namespace | 172 } // namespace |
173 | 173 |
174 /////////////////////////////////////////////////////////////////////////////// | 174 /////////////////////////////////////////////////////////////////////////////// |
175 // WindowSizer, public: | 175 // WindowSizer, public: |
176 | 176 |
177 WindowSizer::WindowSizer( | 177 WindowSizer::WindowSizer( |
178 scoped_ptr<StateProvider> state_provider, | 178 std::unique_ptr<StateProvider> state_provider, |
179 scoped_ptr<TargetDisplayProvider> target_display_provider, | 179 std::unique_ptr<TargetDisplayProvider> target_display_provider, |
180 const Browser* browser) | 180 const Browser* browser) |
181 : state_provider_(std::move(state_provider)), | 181 : state_provider_(std::move(state_provider)), |
182 target_display_provider_(std::move(target_display_provider)), | 182 target_display_provider_(std::move(target_display_provider)), |
183 screen_(gfx::Screen::GetScreen()), | 183 screen_(gfx::Screen::GetScreen()), |
184 browser_(browser) {} | 184 browser_(browser) {} |
185 | 185 |
186 WindowSizer::WindowSizer( | 186 WindowSizer::WindowSizer( |
187 scoped_ptr<StateProvider> state_provider, | 187 std::unique_ptr<StateProvider> state_provider, |
188 scoped_ptr<TargetDisplayProvider> target_display_provider, | 188 std::unique_ptr<TargetDisplayProvider> target_display_provider, |
189 gfx::Screen* screen, | 189 gfx::Screen* screen, |
190 const Browser* browser) | 190 const Browser* browser) |
191 : state_provider_(std::move(state_provider)), | 191 : state_provider_(std::move(state_provider)), |
192 target_display_provider_(std::move(target_display_provider)), | 192 target_display_provider_(std::move(target_display_provider)), |
193 screen_(screen), | 193 screen_(screen), |
194 browser_(browser) { | 194 browser_(browser) { |
195 DCHECK(screen_); | 195 DCHECK(screen_); |
196 } | 196 } |
197 | 197 |
198 WindowSizer::~WindowSizer() { | 198 WindowSizer::~WindowSizer() { |
199 } | 199 } |
200 | 200 |
201 // static | 201 // static |
202 void WindowSizer::GetBrowserWindowBoundsAndShowState( | 202 void WindowSizer::GetBrowserWindowBoundsAndShowState( |
203 const std::string& app_name, | 203 const std::string& app_name, |
204 const gfx::Rect& specified_bounds, | 204 const gfx::Rect& specified_bounds, |
205 const Browser* browser, | 205 const Browser* browser, |
206 gfx::Rect* window_bounds, | 206 gfx::Rect* window_bounds, |
207 ui::WindowShowState* show_state) { | 207 ui::WindowShowState* show_state) { |
208 scoped_ptr<StateProvider> state_provider( | 208 std::unique_ptr<StateProvider> state_provider( |
209 new DefaultStateProvider(app_name, browser)); | 209 new DefaultStateProvider(app_name, browser)); |
210 scoped_ptr<TargetDisplayProvider> target_display_provider( | 210 std::unique_ptr<TargetDisplayProvider> target_display_provider( |
211 new DefaultTargetDisplayProvider); | 211 new DefaultTargetDisplayProvider); |
212 const WindowSizer sizer(std::move(state_provider), | 212 const WindowSizer sizer(std::move(state_provider), |
213 std::move(target_display_provider), browser); | 213 std::move(target_display_provider), browser); |
214 sizer.DetermineWindowBoundsAndShowState(specified_bounds, | 214 sizer.DetermineWindowBoundsAndShowState(specified_bounds, |
215 window_bounds, | 215 window_bounds, |
216 show_state); | 216 show_state); |
217 } | 217 } |
218 | 218 |
219 /////////////////////////////////////////////////////////////////////////////// | 219 /////////////////////////////////////////////////////////////////////////////// |
220 // WindowSizer, private: | 220 // WindowSizer, private: |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 426 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
427 switches::kStartMaximized)) | 427 switches::kStartMaximized)) |
428 return ui::SHOW_STATE_MAXIMIZED; | 428 return ui::SHOW_STATE_MAXIMIZED; |
429 | 429 |
430 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) | 430 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) |
431 return browser_->initial_show_state(); | 431 return browser_->initial_show_state(); |
432 | 432 |
433 // Otherwise we use the default which can be overridden later on. | 433 // Otherwise we use the default which can be overridden later on. |
434 return ui::SHOW_STATE_DEFAULT; | 434 return ui::SHOW_STATE_DEFAULT; |
435 } | 435 } |
OLD | NEW |