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" | 18 #include "chrome/common/pref_names.h" |
| 19 #include "ui/base/ui_base_switches.h" |
19 #include "ui/gfx/screen.h" | 20 #include "ui/gfx/screen.h" |
20 | 21 |
21 #if defined(USE_ASH) | 22 #if defined(USE_ASH) |
22 #include "ash/shell.h" | 23 #include "ash/shell.h" |
23 #include "ash/wm/window_positioner.h" | 24 #include "ash/wm/window_positioner.h" |
24 #include "chrome/browser/ui/ash/ash_init.h" | 25 #include "chrome/browser/ui/ash/ash_init.h" |
25 #endif | 26 #endif |
26 | 27 |
27 namespace { | 28 namespace { |
28 | 29 |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 | 436 |
436 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) | 437 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) |
437 return ui::SHOW_STATE_MAXIMIZED; | 438 return ui::SHOW_STATE_MAXIMIZED; |
438 | 439 |
439 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) | 440 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) |
440 return browser_->initial_show_state(); | 441 return browser_->initial_show_state(); |
441 | 442 |
442 // Otherwise we use the default which can be overridden later on. | 443 // Otherwise we use the default which can be overridden later on. |
443 return ui::SHOW_STATE_DEFAULT; | 444 return ui::SHOW_STATE_DEFAULT; |
444 } | 445 } |
OLD | NEW |