Remove ash_util namespace

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
@@ skipping 127 matching lines @@
       ash::switches::DockedWindowsEnabled()) {
     window->SetProperty(aura::client::kShowStateKey, create_params.state);
   }
 
   window->SetProperty(aura::client::kAppIdKey,
                       new std::string(app_window->extension_id()));
 
   if (app_window->window_type_is_panel()) {
     // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
     // The type should have been initialized for mash below, via mus_properties.
-    if (!ash_util::IsRunningInMash())
+    if (!IsRunningInMash())
       window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP_PANEL);
   } else {
     window->SetProperty(aura::client::kAppType,
                         static_cast<int>(ash::AppType::CHROME_APP));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit(
     const AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(create_params, init_params,
                                                      widget);
   if (create_params.is_ime_window) {
     // Put ime windows into the ime window container on the primary display.
     int container_id = ash::kShellWindowId_ImeWindowParentContainer;
-    if (ash_util::IsRunningInMash()) {
+    if (IsRunningInMash()) {
       init_params->mus_properties
           [ui::mojom::WindowManager::kContainerId_InitProperty] =
           mojo::ConvertTo<std::vector<uint8_t>>(container_id);
       int display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
       init_params
           ->mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
           mojo::ConvertTo<std::vector<uint8_t>>(display_id);
     } else {
       init_params->parent = ash::Shell::GetContainer(
           ash::Shell::GetPrimaryRootWindow(), container_id);
     }
   }
   DCHECK_NE(AppWindow::WINDOW_TYPE_PANEL, create_params.window_type);
   DCHECK_NE(AppWindow::WINDOW_TYPE_V1_PANEL, create_params.window_type);
   init_params->mus_properties
       [ui::mojom::WindowManager::kRemoveStandardFrame_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame);
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
     bool use_default_bounds,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(use_default_bounds,
                                                           init_params,
                                                           widget);
 
-  if (ash_util::IsRunningInMash()) {
+  if (IsRunningInMash()) {
     // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
     init_params
         ->mus_properties[ui::mojom::WindowManager::kShelfItemType_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<aura::PropertyConverter::PrimitiveType>(
                 ash::TYPE_APP_PANEL));
   } else if (ash::Shell::HasInstance() && use_default_bounds) {
     // Open a new panel on the target root.
     init_params->context = ash::Shell::GetTargetRootWindow();
     init_params->bounds = gfx::Rect(GetPreferredSize());
@@ skipping 107 matching lines @@
     views::Widget* widget) {
   // Set the delegate now because CustomFrameViewAsh sets the
   // WindowStateDelegate if one is not already set.
   ash::wm::GetWindowState(GetNativeWindow())
       ->SetDelegate(std::unique_ptr<ash::wm::WindowStateDelegate>(
           new NativeAppWindowStateDelegate(app_window(), this)));
 
   if (IsFrameless())
     return CreateNonStandardAppFrame();
 
-  if (ash_util::IsRunningInMash())
+  if (IsRunningInMash())
     return ChromeNativeAppWindowViews::CreateNonClientFrameView(widget);
 
   if (app_window()->window_type_is_panel()) {
     ash::PanelFrameView* frame_view =
         new ash::PanelFrameView(widget, ash::PanelFrameView::FRAME_ASH);
     frame_view->set_context_menu_controller(this);
     if (HasFrameColor())
       frame_view->SetFrameColors(ActiveFrameColor(), InactiveFrameColor());
     return frame_view;
   }
@@ skipping 23 matching lines @@
     // fullscreen is the fullscreen type used by the OS.
     immersive_fullscreen_controller_->SetEnabled(
         ash::ImmersiveFullscreenController::WINDOW_TYPE_PACKAGED_APP,
         (fullscreen_types & AppWindow::FULLSCREEN_TYPE_OS) != 0);
     // Autohide the shelf instead of hiding the shelf completely when only in
     // OS fullscreen.
     ash::wm::WindowState* window_state =
         ash::wm::GetWindowState(widget()->GetNativeWindow());
     window_state->set_hide_shelf_when_fullscreen(fullscreen_types !=
                                                  AppWindow::FULLSCREEN_TYPE_OS);
-    if (!ash_util::IsRunningInMash()) {
+    if (!IsRunningInMash()) {
       DCHECK(ash::Shell::HasInstance());
       ash::Shell::GetInstance()->UpdateShelfVisibility();
     }
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::UpdateDraggableRegions(
     const std::vector<extensions::DraggableRegion>& regions) {
   ChromeNativeAppWindowViewsAura::UpdateDraggableRegions(regions);
 
@@ skipping 18 matching lines @@
     window_tree_host->SetClientArea(insets,
                                     std::move(additional_client_regions));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
 }