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

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

Issue 643103003: Use app_list_service_disabled in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "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/base/ui_base_switches.h"
20 #include "ui/gfx/screen.h" 20 #include "ui/gfx/screen.h"
21 21
22 #if defined(USE_ASH) 22 #if defined(USE_ASH)
23 #include "ash/shell.h" 23 #include "ash/shell.h"
24 #include "ash/wm/window_positioner.h" 24 #include "ash/wm/window_positioner.h"
25 #include "chrome/browser/ui/ash/ash_init.h" 25 #include "chrome/browser/ui/ash/ash_util.h"
26 #endif 26 #endif
27 27
28 namespace { 28 namespace {
29 29
30 // Minimum height of the visible part of a window. 30 // Minimum height of the visible part of a window.
31 const int kMinVisibleHeight = 30; 31 const int kMinVisibleHeight = 30;
32 // Minimum width of the visible part of a window. 32 // Minimum width of the visible part of a window.
33 const int kMinVisibleWidth = 30; 33 const int kMinVisibleWidth = 30;
34 34
35 /////////////////////////////////////////////////////////////////////////////// 35 ///////////////////////////////////////////////////////////////////////////////
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 436
437 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) 437 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
438 return ui::SHOW_STATE_MAXIMIZED; 438 return ui::SHOW_STATE_MAXIMIZED;
439 439
440 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT) 440 if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
441 return browser_->initial_show_state(); 441 return browser_->initial_show_state();
442 442
443 // Otherwise we use the default which can be overridden later on. 443 // Otherwise we use the default which can be overridden later on.
444 return ui::SHOW_STATE_DEFAULT; 444 return ui::SHOW_STATE_DEFAULT;
445 } 445 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698