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

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/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"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/prefs/pref_service.h"
13 #include "build/build_config.h" 12 #include "build/build_config.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/browser/ui/browser_window_state.h" 18 #include "chrome/browser/ui/browser_window_state.h"
20 #include "chrome/browser/ui/host_desktop.h" 19 #include "chrome/browser/ui/host_desktop.h"
21 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "components/prefs/pref_service.h"
22 #include "ui/base/ui_base_switches.h" 22 #include "ui/base/ui_base_switches.h"
23 #include "ui/gfx/screen.h" 23 #include "ui/gfx/screen.h"
24 24
25 #if defined(USE_ASH) 25 #if defined(USE_ASH)
26 #include "ash/shell.h" 26 #include "ash/shell.h"
27 #include "ash/wm/window_positioner.h" 27 #include "ash/wm/window_positioner.h"
28 #include "chrome/browser/ui/ash/ash_util.h" 28 #include "chrome/browser/ui/ash/ash_util.h"
29 #endif 29 #endif
30 30
31 namespace { 31 namespace {
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/voice_search_ui.cc ('k') | chrome/browser/ui/zoom/chrome_zoom_level_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698