| Index: ash/display/display_controller.cc
|
| diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
|
| index 47cd6658eea3060055b475a2d1ce4874e28edb40..2db32f755c01cf1b6ac9ef951b20724400e55e6e 100644
|
| --- a/ash/display/display_controller.cc
|
| +++ b/ash/display/display_controller.cc
|
| @@ -249,7 +249,7 @@ bool DisplayLayout::ConvertToValue(const DisplayLayout& layout,
|
|
|
| std::string DisplayLayout::ToString() const {
|
| const std::string position_str = GetStringFromPosition(position);
|
| - return StringPrintf("%s, %d", position_str.c_str(), offset);
|
| + return base::StringPrintf("%s, %d", position_str.c_str(), offset);
|
| }
|
|
|
| // static
|
| @@ -768,7 +768,8 @@ aura::RootWindow* DisplayController::CreateRootWindowForDisplay(
|
| params.initial_insets = display_info.GetOverscanInsetsInPixel();
|
| params.initial_root_window_scale = display_info.ui_scale();
|
| aura::RootWindow* root_window = new aura::RootWindow(params);
|
| - root_window->SetName(StringPrintf("RootWindow-%d", root_window_count++));
|
| + root_window->SetName(
|
| + base::StringPrintf("RootWindow-%d", root_window_count++));
|
|
|
| // No need to remove RootWindowObserver because
|
| // the DisplayManager object outlives RootWindow objects.
|
|
|