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

Unified Diff: ash/common/frame/custom_frame_view_ash.h

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/aura/wm_window_aura.cc ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/custom_frame_view_ash.h
diff --git a/ash/frame/custom_frame_view_ash.h b/ash/common/frame/custom_frame_view_ash.h
similarity index 88%
rename from ash/frame/custom_frame_view_ash.h
rename to ash/common/frame/custom_frame_view_ash.h
index c894cdf103c8676aa917c19d5d95198785e07955..049e0302de64dd11183baf28445fb7a483c7ae6a 100644
--- a/ash/frame/custom_frame_view_ash.h
+++ b/ash/common/frame/custom_frame_view_ash.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
-#define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#ifndef ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#define ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#include <memory>
@@ -13,9 +13,8 @@
#include "ui/views/window/non_client_view.h"
namespace ash {
-class FrameBorderHitTestController;
class FrameCaptionButtonContainerView;
-class ImmersiveFullscreenController;
+class WmImmersiveFullscreenController;
}
namespace views {
class Widget;
@@ -42,7 +41,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
// CustomFrameViewAsh does not take ownership of
// |immersive_fullscreen_controller|.
void InitImmersiveFullscreenControllerForView(
- ImmersiveFullscreenController* immersive_fullscreen_controller);
+ WmImmersiveFullscreenController* immersive_fullscreen_controller);
// Sets the active and inactive frame colors. Note the inactive frame color
// will have some transparency added when the frame is drawn.
@@ -95,13 +94,9 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
class HeaderView;
HeaderView* header_view_;
- // Updates the hittest bounds overrides based on the window state type.
- std::unique_ptr<FrameBorderHitTestController>
- frame_border_hit_test_controller_;
-
DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
};
} // namespace ash
-#endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#endif // ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
« no previous file with comments | « ash/aura/wm_window_aura.cc ('k') | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698