Chromium Code Reviews| 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 "ash/ash_switches.h" | 5 #include "ash/ash_switches.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 namespace switches { | 10 namespace switches { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 | 113 |
| 114 // Specifies the layout mode and offsets for the secondary display for | 114 // Specifies the layout mode and offsets for the secondary display for |
| 115 // testing. The format is "<t|r|b|l>,<offset>" where t=TOP, r=RIGHT, | 115 // testing. The format is "<t|r|b|l>,<offset>" where t=TOP, r=RIGHT, |
| 116 // b=BOTTOM and L=LEFT. For example, 'r,-100' means the secondary display | 116 // b=BOTTOM and L=LEFT. For example, 'r,-100' means the secondary display |
| 117 // is positioned on the right with -100 offset. (above than primary) | 117 // is positioned on the right with -100 offset. (above than primary) |
| 118 const char kAshSecondaryDisplayLayout[] = "ash-secondary-display-layout"; | 118 const char kAshSecondaryDisplayLayout[] = "ash-secondary-display-layout"; |
| 119 | 119 |
| 120 // Enables the heads-up display for tracking touch points. | 120 // Enables the heads-up display for tracking touch points. |
| 121 const char kAshTouchHud[] = "ash-touch-hud"; | 121 const char kAshTouchHud[] = "ash-touch-hud"; |
| 122 | 122 |
| 123 // Use alternate layout of the shelf for testing a new look and feel: | |
| 124 // crbug's [244983, 244990, 244994, 245005, 245012] | |
|
James Cook
2013/06/13 15:55:30
I would explain briefly the changes here, rather t
Harry McCleave
2013/06/13 22:30:42
Done.
| |
| 125 const char kAshUseAlternateShelfLayout[] = "ash-use-alt-shelf"; | |
|
James Cook
2013/06/13 15:55:30
Should this be ash-use-alternate-shelf to be more
Harry McCleave
2013/06/13 22:30:42
Done.
| |
| 126 | |
| 123 // Uses the 1st display in --ash-host-window-bounds as internal display. | 127 // Uses the 1st display in --ash-host-window-bounds as internal display. |
| 124 // This is for debugging on linux desktop. | 128 // This is for debugging on linux desktop. |
| 125 const char kAshUseFirstDisplayAsInternal[] = | 129 const char kAshUseFirstDisplayAsInternal[] = |
| 126 "ash-use-first-display-as-internal"; | 130 "ash-use-first-display-as-internal"; |
| 127 | 131 |
| 128 // (Most) Chrome OS hardware reports ACPI power button releases correctly. | 132 // (Most) Chrome OS hardware reports ACPI power button releases correctly. |
| 129 // Standard hardware reports releases immediately after presses. If set, we | 133 // Standard hardware reports releases immediately after presses. If set, we |
| 130 // lock the screen or shutdown the system immediately in response to a press | 134 // lock the screen or shutdown the system immediately in response to a press |
| 131 // instead of displaying an interactive animation. | 135 // instead of displaying an interactive animation. |
| 132 const char kAuraLegacyPowerButton[] = "aura-legacy-power-button"; | 136 const char kAuraLegacyPowerButton[] = "aura-legacy-power-button"; |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 150 return !CommandLine::ForCurrentProcess()-> | 154 return !CommandLine::ForCurrentProcess()-> |
| 151 HasSwitch(ash::switches::kAshDisableNewAudioHandler); | 155 HasSwitch(ash::switches::kAshDisableNewAudioHandler); |
| 152 } | 156 } |
| 153 | 157 |
| 154 bool ShowAudioDeviceMenu() { | 158 bool ShowAudioDeviceMenu() { |
| 155 return ash::switches::UseNewAudioHandler() && | 159 return ash::switches::UseNewAudioHandler() && |
| 156 CommandLine::ForCurrentProcess()-> | 160 CommandLine::ForCurrentProcess()-> |
| 157 HasSwitch(ash::switches::kAshEnableAudioDeviceMenu); | 161 HasSwitch(ash::switches::kAshEnableAudioDeviceMenu); |
| 158 } | 162 } |
| 159 | 163 |
| 164 bool UseAlternateShelfLayout() { | |
|
James Cook
2013/06/13 15:55:30
I like this pattern of a UseFoo() function.
| |
| 165 return CommandLine::ForCurrentProcess()-> | |
| 166 HasSwitch(ash::switches::kAshUseAlternateShelfLayout); | |
| 167 } | |
| 168 | |
| 160 } // namespace switches | 169 } // namespace switches |
| 161 } // namespace ash | 170 } // namespace ash |
| OLD | NEW |