| Index: chrome/browser/ui/views/frame/immersive_context_mus.h
|
| diff --git a/ash/common/wm/immersive_context_ash.h b/chrome/browser/ui/views/frame/immersive_context_mus.h
|
| similarity index 52%
|
| copy from ash/common/wm/immersive_context_ash.h
|
| copy to chrome/browser/ui/views/frame/immersive_context_mus.h
|
| index ea725b8ced02ccb029758826213c4239323279ba..e9d309e80e98719b0d46b5345584e72795ed04de 100644
|
| --- a/ash/common/wm/immersive_context_ash.h
|
| +++ b/chrome/browser/ui/views/frame/immersive_context_mus.h
|
| @@ -2,24 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
|
| -#define ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
|
| +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_CONTEXT_MUS_H_
|
| +#define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_CONTEXT_MUS_H_
|
|
|
| #include "ash/shared/immersive_context.h"
|
| #include "base/macros.h"
|
|
|
| -namespace ash {
|
| -
|
| -class ASH_EXPORT ImmersiveContextAsh : public ImmersiveContext {
|
| +class ImmersiveContextMus : public ash::ImmersiveContext {
|
| public:
|
| - ImmersiveContextAsh();
|
| - ~ImmersiveContextAsh() override;
|
| + ImmersiveContextMus();
|
| + ~ImmersiveContextMus() override;
|
|
|
| - // ImmersiveContext:
|
| + // ash::ImmersiveContext:
|
| void InstallResizeHandleWindowTargeter(
|
| - ImmersiveFullscreenController* controller) override;
|
| - void OnEnteringOrExitingImmersive(ImmersiveFullscreenController* controller,
|
| - bool entering) override;
|
| + ash::ImmersiveFullscreenController* controller) override;
|
| + void OnEnteringOrExitingImmersive(
|
| + ash::ImmersiveFullscreenController* controller,
|
| + bool entering) override;
|
| gfx::Rect GetDisplayBoundsInScreen(views::Widget* widget) override;
|
| void AddPointerWatcher(views::PointerWatcher* watcher,
|
| bool wants_moves) override;
|
| @@ -28,9 +27,7 @@ class ASH_EXPORT ImmersiveContextAsh : public ImmersiveContext {
|
| bool IsMouseEventsEnabled() override;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(ImmersiveContextAsh);
|
| + DISALLOW_COPY_AND_ASSIGN(ImmersiveContextMus);
|
| };
|
|
|
| -} // namespace ash
|
| -
|
| -#endif // ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
|
| +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_CONTEXT_MUS_H_
|
|
|