| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" |
| 15 #include "chrome/browser/ui/browser_window_state.h" | 15 #include "chrome/browser/ui/browser_window_state.h" |
| 16 #include "chrome/browser/ui/host_desktop.h" | 16 #include "chrome/browser/ui/host_desktop.h" |
| 17 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/common/pref_names.h" | |
| 19 #include "ui/base/ui_base_switches.h" | 18 #include "ui/base/ui_base_switches.h" |
| 20 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
| 21 | 20 |
| 22 #if defined(USE_ASH) | 21 #if defined(USE_ASH) |
| 23 #include "ash/shell.h" | 22 #include "ash/shell.h" |
| 24 #include "ash/wm/window_positioner.h" | 23 #include "ash/wm/window_positioner.h" |
| 25 #include "chrome/browser/ui/ash/ash_util.h" | 24 #include "chrome/browser/ui/ash/ash_util.h" |
| 26 #endif | 25 #endif |
| 27 | 26 |
| 28 namespace { | 27 namespace { |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 | 433 |
| 435 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) | 434 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) |
| 436 return ui::SHOW_STATE_MAXIMIZED; | 435 return ui::SHOW_STATE_MAXIMIZED; |
| 437 | 436 |
| 438 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) | 437 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) |
| 439 return browser_->initial_show_state(); | 438 return browser_->initial_show_state(); |
| 440 | 439 |
| 441 // Otherwise we use the default which can be overridden later on. | 440 // Otherwise we use the default which can be overridden later on. |
| 442 return ui::SHOW_STATE_DEFAULT; | 441 return ui::SHOW_STATE_DEFAULT; |
| 443 } | 442 } |
| OLD | NEW |