diff options
20 files changed, 51 insertions, 52 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index ec27f84..dc60602 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -386,6 +386,15 @@ 'wm/base_layout_manager.h', 'wm/boot_splash_screen_chromeos.cc', 'wm/boot_splash_screen_chromeos.h', + 'wm/caption_buttons/alternate_frame_caption_button.cc', + 'wm/caption_buttons/alternate_frame_caption_button.h', + 'wm/caption_buttons/frame_caption_button_container_view.cc', + 'wm/caption_buttons/frame_caption_button_container_view.h', + 'wm/caption_buttons/frame_maximize_button.cc', + 'wm/caption_buttons/frame_maximize_button.h', + 'wm/caption_buttons/maximize_bubble_controller.cc', + 'wm/caption_buttons/maximize_bubble_controller.h', + 'wm/caption_buttons/maximize_bubble_frame_state.h', 'wm/coordinate_conversion.cc', 'wm/coordinate_conversion.h', 'wm/custom_frame_view_ash.cc', @@ -424,8 +433,6 @@ 'wm/lock_state_controller_impl2.cc', 'wm/lock_state_controller_impl2.h', 'wm/lock_state_observer.h', - 'wm/maximize_bubble_controller.cc', - 'wm/maximize_bubble_controller.h', 'wm/mru_window_tracker.cc', 'wm/mru_window_tracker.h', 'wm/overlay_event_filter.cc', @@ -503,21 +510,14 @@ 'wm/window_util.h', 'wm/workspace_controller.cc', 'wm/workspace_controller.h', - 'wm/workspace/alternate_frame_caption_button.cc', - 'wm/workspace/alternate_frame_caption_button.h', 'wm/workspace/auto_window_management.cc', 'wm/workspace/auto_window_management.h', 'wm/workspace/colored_window_controller.cc', 'wm/workspace/colored_window_controller.h', 'wm/workspace/desktop_background_fade_controller.cc', 'wm/workspace/desktop_background_fade_controller.h', - 'wm/workspace/frame_caption_button_container_view.cc', - 'wm/workspace/frame_caption_button_container_view.h', - 'wm/workspace/frame_maximize_button.cc', - 'wm/workspace/frame_maximize_button.h', 'wm/workspace/magnetism_matcher.cc', 'wm/workspace/magnetism_matcher.h', - 'wm/workspace/maximize_bubble_frame_state.h', 'wm/workspace/multi_window_resize_controller.cc', 'wm/workspace/multi_window_resize_controller.h', 'wm/workspace/phantom_window_controller.cc', @@ -756,6 +756,7 @@ 'touch/touch_observer_hud_unittest.cc', 'wm/ash_native_cursor_manager_unittest.cc', 'wm/base_layout_manager_unittest.cc', + 'wm/caption_buttons/frame_caption_button_container_view_unittest.cc', 'wm/custom_frame_view_ash_unittest.cc', 'wm/dock/docked_window_layout_manager_unittest.cc', 'wm/dock/docked_window_resizer_unittest.cc', @@ -783,7 +784,6 @@ 'wm/workspace_controller_test_helper.cc', 'wm/workspace_controller_test_helper.h', 'wm/workspace_controller_unittest.cc', - 'wm/workspace/frame_caption_button_container_view_unittest.cc', 'wm/workspace/magnetism_matcher_unittest.cc', 'wm/workspace/multi_window_resize_controller_unittest.cc', 'wm/workspace/snap_sizer_unittest.cc', diff --git a/ash/wm/workspace/alternate_frame_caption_button.cc b/ash/wm/caption_buttons/alternate_frame_caption_button.cc index 578e46a6..6f6b41f 100644 --- a/ash/wm/workspace/alternate_frame_caption_button.cc +++ b/ash/wm/caption_buttons/alternate_frame_caption_button.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/workspace/alternate_frame_caption_button.h" +#include "ash/wm/caption_buttons/alternate_frame_caption_button.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/workspace/alternate_frame_caption_button.h b/ash/wm/caption_buttons/alternate_frame_caption_button.h index 7f5e28f..5c0ebda 100644 --- a/ash/wm/workspace/alternate_frame_caption_button.h +++ b/ash/wm/caption_buttons/alternate_frame_caption_button.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_WORKSPACE_ALTERNATE_FRAME_CAPTION_BUTTON_H_ -#define ASH_WM_WORKSPACE_ALTERNATE_FRAME_CAPTION_BUTTON_H_ +#ifndef ASH_WM_CAPTION_BUTTONS_ALTERNATE_FRAME_CAPTION_BUTTON_H_ +#define ASH_WM_CAPTION_BUTTONS_ALTERNATE_FRAME_CAPTION_BUTTON_H_ #include "ash/ash_export.h" #include "base/memory/scoped_ptr.h" @@ -66,4 +66,4 @@ class ASH_EXPORT AlternateFrameCaptionButton : public views::CustomButton { } // namespace ash -#endif // ASH_WM_WORKSPACE_ALTERNATE_FRAME_CAPTION_BUTTON_H_ +#endif // ASH_WM_CAPTION_BUTTONS_ALTERNATE_FRAME_CAPTION_BUTTON_H_ diff --git a/ash/wm/workspace/frame_caption_button_container_view.cc b/ash/wm/caption_buttons/frame_caption_button_container_view.cc index 264c57a..7609978 100644 --- a/ash/wm/workspace/frame_caption_button_container_view.cc +++ b/ash/wm/caption_buttons/frame_caption_button_container_view.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/workspace/frame_caption_button_container_view.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/shell_delegate.h" +#include "ash/wm/caption_buttons/alternate_frame_caption_button.h" +#include "ash/wm/caption_buttons/frame_maximize_button.h" #include "ash/wm/window_settings.h" -#include "ash/wm/workspace/alternate_frame_caption_button.h" -#include "ash/wm/workspace/frame_maximize_button.h" #include "grit/ash_resources.h" #include "grit/ui_strings.h" // Accessibility names #include "ui/base/hit_test.h" diff --git a/ash/wm/workspace/frame_caption_button_container_view.h b/ash/wm/caption_buttons/frame_caption_button_container_view.h index be76e77..c9590c6 100644 --- a/ash/wm/workspace/frame_caption_button_container_view.h +++ b/ash/wm/caption_buttons/frame_caption_button_container_view.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_WORKSPACE_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ -#define ASH_WM_WORKSPACE_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#ifndef ASH_WM_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#define ASH_WM_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ #include "ash/ash_export.h" #include "ui/gfx/image/image_skia.h" @@ -146,4 +146,4 @@ class ASH_EXPORT FrameCaptionButtonContainerView } // namesapace ash -#endif // ASH_WM_WORKSPACE_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#endif // ASH_WM_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ diff --git a/ash/wm/workspace/frame_caption_button_container_view_unittest.cc b/ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc index cb732bf..ade3399 100644 --- a/ash/wm/workspace/frame_caption_button_container_view_unittest.cc +++ b/ash/wm/caption_buttons/frame_caption_button_container_view_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/workspace/frame_caption_button_container_view.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/ash_switches.h" #include "ash/test/ash_test_base.h" diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/caption_buttons/frame_maximize_button.cc index 08980c2..d2bab34 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/caption_buttons/frame_maximize_button.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "ash/wm/workspace/frame_maximize_button.h" +#include "ash/wm/caption_buttons/frame_maximize_button.h" #include "ash/launcher/launcher.h" #include "ash/screen_ash.h" @@ -10,7 +10,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/touch/touch_uma.h" -#include "ash/wm/maximize_bubble_controller.h" +#include "ash/wm/caption_buttons/maximize_bubble_controller.h" #include "ash/wm/property_util.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_settings.h" diff --git a/ash/wm/workspace/frame_maximize_button.h b/ash/wm/caption_buttons/frame_maximize_button.h index f01df6c..65cad11 100644 --- a/ash/wm/workspace/frame_maximize_button.h +++ b/ash/wm/caption_buttons/frame_maximize_button.h @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ -#define ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ +#ifndef ASH_WM_CAPTION_BUTTONS_FRAME_MAXIMIZE_BUTTON_H_ +#define ASH_WM_CAPTION_BUTTONS_FRAME_MAXIMIZE_BUTTON_H_ #include "ash/ash_export.h" -#include "ash/wm/workspace/maximize_bubble_frame_state.h" +#include "ash/wm/caption_buttons/maximize_bubble_frame_state.h" #include "ash/wm/workspace/snap_types.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" @@ -180,4 +180,4 @@ class ASH_EXPORT FrameMaximizeButton : public views::ImageButton, } // namespace ash -#endif // ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_ +#endif // ASH_WM_CAPTION_BUTTONS_FRAME_MAXIMIZE_BUTTON_H_ diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/caption_buttons/maximize_bubble_controller.cc index 10f25b3..088db3c 100644 --- a/ash/wm/maximize_bubble_controller.cc +++ b/ash/wm/caption_buttons/maximize_bubble_controller.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "ash/wm/maximize_bubble_controller.h" +#include "ash/wm/caption_buttons/maximize_bubble_controller.h" #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" +#include "ash/wm/caption_buttons/frame_maximize_button.h" #include "ash/wm/window_animations.h" -#include "ash/wm/workspace/frame_maximize_button.h" #include "base/timer/timer.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/wm/maximize_bubble_controller.h b/ash/wm/caption_buttons/maximize_bubble_controller.h index 7328ea2..602efd8 100644 --- a/ash/wm/maximize_bubble_controller.h +++ b/ash/wm/caption_buttons/maximize_bubble_controller.h @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef ASH_WM_MAXIMIZE_BUBBLE_CONTROLLER_H_ -#define ASH_WM_MAXIMIZE_BUBBLE_CONTROLLER_H_ +#ifndef ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_CONTROLLER_H_ +#define ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_CONTROLLER_H_ #include "ash/ash_export.h" -#include "ash/wm/workspace/maximize_bubble_frame_state.h" +#include "ash/wm/caption_buttons/maximize_bubble_frame_state.h" #include "ash/wm/workspace/snap_types.h" #include "base/memory/scoped_ptr.h" @@ -98,4 +98,4 @@ class ASH_EXPORT MaximizeBubbleController { } // namespace ash -#endif // ASH_WM_MAXIMIZE_BUBBLE_CONTROLLER_H_ +#endif // ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_CONTROLLER_H_ diff --git a/ash/wm/workspace/maximize_bubble_frame_state.h b/ash/wm/caption_buttons/maximize_bubble_frame_state.h index 80fb835..1737818 100644 --- a/ash/wm/workspace/maximize_bubble_frame_state.h +++ b/ash/wm/caption_buttons/maximize_bubble_frame_state.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef ASH_WM_WORKSPACE_MAXIMIZE_BUBBLE_FRAME_STATE_H_ -#define ASH_WM_WORKSPACE_MAXIMIZE_BUBBLE_FRAME_STATE_H_ +#ifndef ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_FRAME_STATE_H_ +#define ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_FRAME_STATE_H_ namespace ash { @@ -17,4 +17,4 @@ enum MaximizeBubbleFrameState { } // namespace views -#endif // ASH_WM_WORKSPACE_MAXIMIZE_BUBBLE_FRAME_STATE_H_ +#endif // ASH_WM_CAPTION_BUTTONS_MAXIMIZE_BUBBLE_FRAME_STATE_H_ diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc index 7824464..a4b8efb 100644 --- a/ash/wm/custom_frame_view_ash.cc +++ b/ash/wm/custom_frame_view_ash.cc @@ -4,8 +4,8 @@ #include "ash/wm/custom_frame_view_ash.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/wm/frame_painter.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" #include "grit/ash_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc index 0499f29..5c1098b 100644 --- a/ash/wm/custom_frame_view_ash_unittest.cc +++ b/ash/wm/custom_frame_view_ash_unittest.cc @@ -7,11 +7,11 @@ #include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/maximize_bubble_controller.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" +#include "ash/wm/caption_buttons/frame_maximize_button.h" +#include "ash/wm/caption_buttons/maximize_bubble_controller.h" #include "ash/wm/property_util.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" -#include "ash/wm/workspace/frame_maximize_button.h" #include "ash/wm/workspace/snap_sizer.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 17b7a20..577d2b5 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -15,7 +15,6 @@ #include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace/snap_types.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index 3528f35..3e1a31d 100644 --- a/ash/wm/frame_painter.cc +++ b/ash/wm/frame_painter.cc @@ -11,10 +11,10 @@ #include "ash/root_window_settings.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/wm/property_util.h" #include "ash/wm/window_settings.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" #include "base/logging.h" // DCHECK #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/ash/wm/frame_painter_unittest.cc b/ash/wm/frame_painter_unittest.cc index 7790339..14fc889 100644 --- a/ash/wm/frame_painter_unittest.cc +++ b/ash/wm/frame_painter_unittest.cc @@ -9,9 +9,9 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/wm/window_settings.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "grit/ash_resources.h" diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc index 6f985bf..cc0b062 100644 --- a/ash/wm/panels/panel_frame_view.cc +++ b/ash/wm/panels/panel_frame_view.cc @@ -4,8 +4,8 @@ #include "ash/wm/panels/panel_frame_view.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/wm/frame_painter.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/cursor/cursor.h" diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.cc index a70e813..b179f68 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "base/i18n/rtl.h" #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index a943bb8..36d387b 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" #include "ash/ash_switches.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "ash/wm/frame_painter.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/immersive_fullscreen_configuration.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index 06365fa..0cb5849 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc @@ -6,7 +6,7 @@ #include "ash/ash_constants.h" #include "ash/ash_switches.h" -#include "ash/wm/workspace/frame_caption_button_container_view.h" +#include "ash/wm/caption_buttons/frame_caption_button_container_view.h" #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" |