| Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| index 8122d4fcb23b10fe171c4248f24ddb33f4fd0f9c..db42c9e9c7e3664afd656a046165dfe8e1173478 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
| @@ -195,13 +195,13 @@ base::DictionaryValue* ConvertBoundsToValue(const gfx::Rect& bounds) {
|
|
|
| DisplayOptionsHandler::DisplayOptionsHandler() {
|
| // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
|
| - if (!chrome::IsRunningInMash())
|
| + if (!ash_util::IsRunningInMash())
|
| ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
|
| }
|
|
|
| DisplayOptionsHandler::~DisplayOptionsHandler() {
|
| // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
|
| - if (!chrome::IsRunningInMash())
|
| + if (!ash_util::IsRunningInMash())
|
| ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
|
| }
|
|
|
| @@ -380,7 +380,7 @@ void DisplayOptionsHandler::SendAllDisplayInfo() {
|
|
|
| void DisplayOptionsHandler::UpdateDisplaySettingsEnabled() {
|
| // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
|
| - if (chrome::IsRunningInMash())
|
| + if (ash_util::IsRunningInMash())
|
| return;
|
|
|
| display::DisplayManager* display_manager = GetDisplayManager();
|
|
|