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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index 17f832f3bddf172f9a61656b42570b25a354b55d..27594c09fca07ad0fd368412a460489282cddb13 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -20,22 +20,19 @@
#include "ash/wm/window_state_aura.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
+#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/cpp/window.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/mus/mus_util.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
#include "ui/base/hit_test.h"
#include "ui/base/models/simple_menu_model.h"
+#include "ui/gfx/skia_util.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/widget/widget.h"
-#if defined(MOJO_SHELL_CLIENT)
-#include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/cpp/window.h"
-#include "services/ui/public/interfaces/window_manager.mojom.h"
-#include "ui/aura/mus/mus_util.h"
-#include "ui/gfx/skia_util.h"
-#endif
-
using extensions::AppWindow;
namespace {
@@ -148,11 +145,9 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit(
ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
ash::kShellWindowId_ImeWindowParentContainer);
}
-#if defined(MOJO_SHELL_CLIENT)
init_params->mus_properties
[ui::mojom::WindowManager::kRemoveStandardFrame_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame);
-#endif
}
void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
@@ -330,7 +325,6 @@ void ChromeNativeAppWindowViewsAuraAsh::UpdateDraggableRegions(
const std::vector<extensions::DraggableRegion>& regions) {
ChromeNativeAppWindowViewsAura::UpdateDraggableRegions(regions);
-#if defined(MOJO_SHELL_CLIENT)
SkRegion* draggable_region = GetDraggableRegion();
// Set the NativeAppWindow's draggable region on the mus window.
if (draggable_region && !draggable_region->isEmpty() && widget() &&
@@ -349,5 +343,4 @@ void ChromeNativeAppWindowViewsAuraAsh::UpdateDraggableRegions(
GetMusWindow(widget()->GetNativeWindow())
->SetClientArea(insets, std::move(additional_client_regions));
}
-#endif
}
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698