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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
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 "base/command_line.h"
7 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
8 #include "base/command_line.h" 9 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/ash/ash_init.h" 12 #include "chrome/browser/ui/ash/ash_init.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/browser_window_state.h" 16 #include "chrome/browser/ui/browser_window_state.h"
17 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
18 #include "chrome/common/chrome_switches.h"
19 #include "ui/gfx/screen.h" 19 #include "ui/gfx/screen.h"
20 20
21 // Minimum height of the visible part of a window. 21 // Minimum height of the visible part of a window.
22 const int kMinVisibleHeight = 30; 22 const int kMinVisibleHeight = 30;
23 // Minimum width of the visible part of a window. 23 // Minimum width of the visible part of a window.
24 const int kMinVisibleWidth = 30; 24 const int kMinVisibleWidth = 30;
25 25
26 class DefaultMonitorInfoProvider : public MonitorInfoProvider { 26 class DefaultMonitorInfoProvider : public MonitorInfoProvider {
27 public: 27 public:
28 explicit DefaultMonitorInfoProvider(const gfx::Screen* screen) 28 explicit DefaultMonitorInfoProvider(const gfx::Screen* screen)
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) 393 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
394 return ui::SHOW_STATE_MAXIMIZED; 394 return ui::SHOW_STATE_MAXIMIZED;
395 395
396 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) 396 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
397 return browser_->initial_show_state(); 397 return browser_->initial_show_state();
398 398
399 // Otherwise we use the default which can be overridden later on. 399 // Otherwise we use the default which can be overridden later on.
400 return ui::SHOW_STATE_DEFAULT; 400 return ui::SHOW_STATE_DEFAULT;
401 } 401 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/web_ui_unittest.cc ('k') | chrome/browser/ui/window_snapshot/window_snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698