summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/ash.gyp16
-rw-r--r--ash/root_window_controller.cc2
-rw-r--r--ash/shell/panel_window.cc2
-rw-r--r--ash/wm/panels/OWNERS2
-rw-r--r--ash/wm/panels/panel_frame_view.cc (renamed from ash/wm/panel_frame_view.cc)2
-rw-r--r--ash/wm/panels/panel_frame_view.h (renamed from ash/wm/panel_frame_view.h)8
-rw-r--r--ash/wm/panels/panel_layout_manager.cc (renamed from ash/wm/panel_layout_manager.cc)2
-rw-r--r--ash/wm/panels/panel_layout_manager.h (renamed from ash/wm/panel_layout_manager.h)6
-rw-r--r--ash/wm/panels/panel_layout_manager_unittest.cc (renamed from ash/wm/panel_layout_manager_unittest.cc)3
-rw-r--r--ash/wm/panels/panel_window_resizer.cc (renamed from ash/wm/panel_window_resizer.cc)4
-rw-r--r--ash/wm/panels/panel_window_resizer.h (renamed from ash/wm/panel_window_resizer.h)6
-rw-r--r--ash/wm/panels/panel_window_resizer_unittest.cc (renamed from ash/wm/panel_window_resizer_unittest.cc)4
-rw-r--r--ash/wm/workspace/workspace_window_resizer.cc2
-rw-r--r--chrome/browser/ui/views/extensions/native_app_window_views.cc2
14 files changed, 32 insertions, 29 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index d1e3497..59b2f62 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -359,12 +359,12 @@
'wm/maximize_bubble_controller.h',
'wm/overlay_event_filter.cc',
'wm/overlay_event_filter.h',
- 'wm/panel_frame_view.cc',
- 'wm/panel_frame_view.h',
- 'wm/panel_layout_manager.cc',
- 'wm/panel_layout_manager.h',
- 'wm/panel_window_resizer.cc',
- 'wm/panel_window_resizer.h',
+ 'wm/panels/panel_frame_view.cc',
+ 'wm/panels/panel_frame_view.h',
+ 'wm/panels/panel_layout_manager.cc',
+ 'wm/panels/panel_layout_manager.h',
+ 'wm/panels/panel_window_resizer.cc',
+ 'wm/panels/panel_window_resizer.h',
'wm/partial_screenshot_view.cc',
'wm/partial_screenshot_view.h',
'wm/power_button_controller.cc',
@@ -639,8 +639,8 @@
'wm/custom_frame_view_ash_unittest.cc',
'wm/drag_window_resizer_unittest.cc',
'wm/frame_painter_unittest.cc',
- 'wm/panel_layout_manager_unittest.cc',
- 'wm/panel_window_resizer_unittest.cc',
+ 'wm/panels/panel_layout_manager_unittest.cc',
+ 'wm/panels/panel_window_resizer_unittest.cc',
'wm/power_button_controller_unittest.cc',
'wm/screen_dimmer_unittest.cc',
'wm/session_state_controller_impl2_unittest.cc',
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index dcb3bab..1fa22c2 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -21,7 +21,7 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/wm/base_layout_manager.h"
#include "ash/wm/boot_splash_screen.h"
-#include "ash/wm/panel_layout_manager.h"
+#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/property_util.h"
#include "ash/wm/root_window_layout_manager.h"
#include "ash/wm/screen_dimmer.h"
diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc
index 9147078..80acf7d 100644
--- a/ash/shell/panel_window.cc
+++ b/ash/shell/panel_window.cc
@@ -6,7 +6,7 @@
#include "ash/screen_ash.h"
#include "ash/shell.h"
-#include "ash/wm/panel_frame_view.h"
+#include "ash/wm/panels/panel_frame_view.h"
#include "base/utf_string_conversions.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/panels/OWNERS b/ash/wm/panels/OWNERS
new file mode 100644
index 0000000..c9dc2b8
--- /dev/null
+++ b/ash/wm/panels/OWNERS
@@ -0,0 +1,2 @@
+flackr@chromium.org
+stevenjb@chromium.org
diff --git a/ash/wm/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 261176b..176547b 100644
--- a/ash/wm/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panel_frame_view.h"
+#include "ash/wm/panels/panel_frame_view.h"
#include "ash/wm/frame_painter.h"
#include "grit/ash_resources.h"
diff --git a/ash/wm/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h
index e9e97bc..eaab9f1 100644
--- a/ash/wm/panel_frame_view.h
+++ b/ash/wm/panels/panel_frame_view.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_PANEL_FRAME_VIEW_H_
-#define ASH_WM_PANEL_FRAME_VIEW_H_
+#ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
+#define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
#include "ash/ash_export.h"
#include "base/basictypes.h"
#include "ui/aura/aura_export.h"
#include "ui/gfx/font.h"
-#include "ui/views/window/non_client_view.h"
#include "ui/views/controls/button/button.h" // ButtonListener
+#include "ui/views/window/non_client_view.h"
namespace views {
class ImageButton;
@@ -68,4 +68,4 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView,
}
-#endif // ASH_WM_PANEL_FRAME_VIEW_H_
+#endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
diff --git a/ash/wm/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
index 4796dff..cd612e8 100644
--- a/ash/wm/panel_layout_manager.cc
+++ b/ash/wm/panels/panel_layout_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panel_layout_manager.h"
+#include "ash/wm/panels/panel_layout_manager.h"
#include <algorithm>
#include <map>
diff --git a/ash/wm/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
index 252c2d0..41a894a 100644
--- a/ash/wm/panel_layout_manager.h
+++ b/ash/wm/panels/panel_layout_manager.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_WM_PANEL_LAYOUT_MANAGER_H_
-#define ASH_WM_PANEL_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
+#define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
#include <list>
@@ -150,4 +150,4 @@ class ASH_EXPORT PanelLayoutManager
} // namespace internal
} // namespace ash
-#endif // ASH_WM_PANEL_LAYOUT_MANAGER_H_
+#endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 7ab8be3..a7a7a6e 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panel_layout_manager.h"
+#include "ash/wm/panels/panel_layout_manager.h"
+
#include "ash/ash_switches.h"
#include "ash/launcher/launcher.h"
#include "ash/launcher/launcher_button.h"
diff --git a/ash/wm/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc
index f1ec415..0f82db5 100644
--- a/ash/wm/panel_window_resizer.cc
+++ b/ash/wm/panels/panel_window_resizer.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panel_window_resizer.h"
+#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/launcher/launcher.h"
#include "ash/root_window_controller.h"
#include "ash/shelf_types.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/panel_layout_manager.h"
+#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_properties.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h
index 93cbb30..76657d3 100644
--- a/ash/wm/panel_window_resizer.h
+++ b/ash/wm/panels/panel_window_resizer.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_WM_PANEL_WINDOW_RESIZER_H_
-#define ASH_WM_PANEL_WINDOW_RESIZER_H_
+#ifndef ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
+#define ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
#include "ash/wm/window_resizer.h"
#include "base/compiler_specific.h"
@@ -85,4 +85,4 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer {
} // namespace aura
-#endif // ASH_WM_PANEL_WINDOW_RESIZER_H_
+#endif // ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
diff --git a/ash/wm/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 11ee8e1..93fe71a 100644
--- a/ash/wm/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panel_window_resizer.h"
+#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/launcher/launcher.h"
#include "ash/shelf_types.h"
@@ -11,7 +11,7 @@
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/test/test_launcher_delegate.h"
-#include "ash/wm/panel_layout_manager.h"
+#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/window_properties.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/root_window.h"
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 1c7609c..6c23c9f 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -16,7 +16,7 @@
#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/default_window_resizer.h"
#include "ash/wm/drag_window_resizer.h"
-#include "ash/wm/panel_window_resizer.h"
+#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/phantom_window_controller.h"
diff --git a/chrome/browser/ui/views/extensions/native_app_window_views.cc b/chrome/browser/ui/views/extensions/native_app_window_views.cc
index 3ded75c..c07ef123 100644
--- a/chrome/browser/ui/views/extensions/native_app_window_views.cc
+++ b/chrome/browser/ui/views/extensions/native_app_window_views.cc
@@ -31,7 +31,7 @@
#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "ash/wm/custom_frame_view_ash.h"
-#include "ash/wm/panel_frame_view.h"
+#include "ash/wm/panels/panel_frame_view.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "ui/aura/root_window.h"
#endif
generated by cgit v1.1 at 2025-02-04 21:05:57 +0000