diff options
Diffstat (limited to 'chrome/views')
| -rw-r--r-- | chrome/views/SConscript | 64 | ||||
| -rw-r--r-- | chrome/views/focus_manager_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/views/table_view_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/views/view_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/views/views.vcproj | 152 | ||||
| -rw-r--r-- | chrome/views/widget/accelerator_handler.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/aero_tooltip_manager.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/hwnd_notification_source.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/root_view.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/root_view_drop_target.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/tooltip_manager.h | 8 | ||||
| -rw-r--r-- | chrome/views/widget/widget.h | 6 | ||||
| -rw-r--r-- | chrome/views/widget/widget_win.h | 6 | ||||
| -rw-r--r-- | chrome/views/window/app_modal_dialog_delegate.h (renamed from chrome/views/app_modal_dialog_delegate.h) | 8 | ||||
| -rw-r--r-- | chrome/views/window/client_view.cc (renamed from chrome/views/client_view.cc) | 6 | ||||
| -rw-r--r-- | chrome/views/window/client_view.h (renamed from chrome/views/client_view.h) | 6 | ||||
| -rw-r--r-- | chrome/views/window/custom_frame_view.cc (renamed from chrome/views/custom_frame_view.cc) | 6 | ||||
| -rw-r--r-- | chrome/views/window/custom_frame_view.h (renamed from chrome/views/custom_frame_view.h) | 12 | ||||
| -rw-r--r-- | chrome/views/window/dialog_client_view.cc (renamed from chrome/views/dialog_client_view.cc) | 8 | ||||
| -rw-r--r-- | chrome/views/window/dialog_client_view.h (renamed from chrome/views/dialog_client_view.h) | 8 | ||||
| -rw-r--r-- | chrome/views/window/dialog_delegate.cc (renamed from chrome/views/dialog_delegate.cc) | 4 | ||||
| -rw-r--r-- | chrome/views/window/dialog_delegate.h (renamed from chrome/views/dialog_delegate.h) | 10 | ||||
| -rw-r--r-- | chrome/views/window/native_frame_view.cc (renamed from chrome/views/native_frame_view.cc) | 4 | ||||
| -rw-r--r-- | chrome/views/window/native_frame_view.h (renamed from chrome/views/native_frame_view.h) | 8 | ||||
| -rw-r--r-- | chrome/views/window/non_client_view.cc (renamed from chrome/views/non_client_view.cc) | 4 | ||||
| -rw-r--r-- | chrome/views/window/non_client_view.h (renamed from chrome/views/non_client_view.h) | 8 | ||||
| -rw-r--r-- | chrome/views/window/window.h (renamed from chrome/views/window.h) | 6 | ||||
| -rw-r--r-- | chrome/views/window/window_delegate.cc (renamed from chrome/views/window_delegate.cc) | 6 | ||||
| -rw-r--r-- | chrome/views/window/window_delegate.h (renamed from chrome/views/window_delegate.h) | 6 | ||||
| -rw-r--r-- | chrome/views/window/window_resources.h (renamed from chrome/views/window_resources.h) | 6 | ||||
| -rw-r--r-- | chrome/views/window/window_win.cc (renamed from chrome/views/window_win.cc) | 12 | ||||
| -rw-r--r-- | chrome/views/window/window_win.h (renamed from chrome/views/window_win.h) | 12 |
32 files changed, 215 insertions, 203 deletions
diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 6030612..a4c541a 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -42,7 +42,6 @@ input_files = ChromeFileList([ ]), 'accelerator.cc', 'accelerator.h', - 'app_modal_dialog_delegate.h', 'background.cc', 'background.h', 'base_button.cc', @@ -59,19 +58,11 @@ input_files = ChromeFileList([ 'checkbox.h', 'chrome_menu.cc', 'chrome_menu.h', - 'client_view.cc', - 'client_view.h', 'combo_box.cc', 'combo_box.h', 'controller.h', - 'custom_frame_window.cc', - 'custom_frame_window.h', 'decision.cc', 'decision.h', - 'dialog_client_view.cc', - 'dialog_client_view.h', - 'dialog_delegate.cc', - 'dialog_delegate.h', 'event.cc', 'event.h', 'external_focus_tracker.cc', @@ -104,8 +95,6 @@ input_files = ChromeFileList([ 'native_control.h', 'native_scroll_bar.cc', 'native_scroll_bar.h', - 'non_client_view.cc', - 'non_client_view.h', 'painter.cc', 'painter.h', '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', @@ -160,11 +149,24 @@ input_files = ChromeFileList([ 'widget/widget.h', 'widget/widget_win.cc', 'widget/widget_win.h', - 'window.cc', - 'window.h', - 'window_delegate.cc', - 'window_delegate.h', - 'window_resources.h', + 'window/app_modal_dialog_delegate.h', + 'window/client_view.cc', + 'window/client_view.h', + 'window/custom_frame_view.cc', + 'window/custom_frame_view.h', + 'window/dialog_client_view.cc', + 'window/dialog_client_view.h', + 'window/dialog_delegate.cc', + 'window/dialog_delegate.h', + 'window/native_frame_view.cc', + 'window/native_frame_view.h', + 'window/non_client_view.cc', + 'window/non_client_view.h', + 'window/window.cc', + 'window/window.h', + 'window/window_delegate.cc', + 'window/window_delegate.h', + 'window/window_resources.h', ]) if not env.Bit('windows'): @@ -220,11 +222,7 @@ if env.Bit('linux'): 'button_dropdown.cc', 'checkbox.cc', 'chrome_menu.cc', - 'client_view.cc', 'combo_box.cc', - 'custom_frame_window.cc', - 'dialog_delegate.cc', - 'dialog_client_view.cc', 'decision.cc', 'event.cc', 'focus_manager.cc', @@ -237,7 +235,6 @@ if env.Bit('linux'): 'native_button.cc', 'native_control.cc', 'native_scroll_bar.cc', - 'non_client_view.cc', 'radio_button.cc', 'resize_corner.cc', 'separator.cc', @@ -252,8 +249,14 @@ if env.Bit('linux'): 'widget/root_view_drop_target.cc', 'widget/tooltip_manager.cc', 'widget/widget_win.cc', - 'window.cc', - 'window_delegate.cc', + 'window/client_view.cc', + 'window/custom_frame_view.cc', + 'window/dialog_delegate.cc', + 'window/dialog_client_view.cc', + 'window/native_frame_view.cc', + 'window/non_client_view.cc', + 'window/window_delegate.cc', + 'window/window_win.cc', ) if env.Bit('mac'): @@ -271,11 +274,7 @@ if env.Bit('mac'): 'button_dropdown.cc', 'checkbox.cc', 'chrome_menu.cc', - 'client_view.cc', 'combo_box.cc', - 'custom_frame_window.cc', - 'dialog_delegate.cc', - 'dialog_client_view.cc', 'decision.cc', 'event.cc', 'external_focus_tracker.cc', @@ -293,7 +292,6 @@ if env.Bit('mac'): 'native_button.cc', 'native_control.cc', 'native_scroll_bar.cc', - 'non_client_view.cc', 'painter.cc', 'radio_button.cc', 'repeat_controller.cc', @@ -315,8 +313,14 @@ if env.Bit('mac'): 'widget/root_view_drop_target.cc', 'widget/tooltip_manager.cc', 'widget/widget_win.cc', - 'window.cc', - 'window_delegate.cc', + 'window/client_view.cc', + 'window/custom_frame_view.cc', + 'window/dialog_delegate.cc', + 'window/dialog_client_view.cc', + 'window/native_frame_view.cc', + 'window/non_client_view.cc', + 'window/window_delegate.cc', + 'window/window_win.cc', ) env.ChromeLibrary('views', input_files) diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc index b08e19a..e41920c 100644 --- a/chrome/views/focus_manager_unittest.cc +++ b/chrome/views/focus_manager_unittest.cc @@ -23,8 +23,8 @@ #include "chrome/views/widget/accelerator_handler.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" -#include "chrome/views/window.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window.h" +#include "chrome/views/window/window_delegate.h" #include "SkColor.h" diff --git a/chrome/views/table_view_unittest.cc b/chrome/views/table_view_unittest.cc index 06f3458..f94e86d 100644 --- a/chrome/views/table_view_unittest.cc +++ b/chrome/views/table_view_unittest.cc @@ -7,8 +7,8 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/views/table_view.h" -#include "chrome/views/window_win.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window_delegate.h" +#include "chrome/views/window/window_win.h" #include "testing/gtest/include/gtest/gtest.h" using views::TableView; diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc index 7da9f42..dcb49f7 100644 --- a/chrome/views/view_unittest.cc +++ b/chrome/views/view_unittest.cc @@ -8,12 +8,12 @@ #include "chrome/common/notification_service.h" #include "chrome/views/background.h" #include "chrome/views/checkbox.h" -#include "chrome/views/dialog_delegate.h" #include "chrome/views/event.h" #include "chrome/views/view.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "testing/gtest/include/gtest/gtest.h" using namespace views; diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj index 890347a..a9c31cb 100644 --- a/chrome/views/views.vcproj +++ b/chrome/views/views.vcproj @@ -331,6 +331,86 @@ > </File> </Filter> + <Filter + Name="window" + > + <File + RelativePath=".\window\app_modal_dialog_delegate.h" + > + </File> + <File + RelativePath=".\window\client_view.cc" + > + </File> + <File + RelativePath=".\window\client_view.h" + > + </File> + <File + RelativePath=".\window\custom_frame_view.cc" + > + </File> + <File + RelativePath=".\window\custom_frame_view.h" + > + </File> + <File + RelativePath=".\window\dialog_client_view.cc" + > + </File> + <File + RelativePath=".\window\dialog_client_view.h" + > + </File> + <File + RelativePath=".\window\dialog_delegate.cc" + > + </File> + <File + RelativePath=".\window\dialog_delegate.h" + > + </File> + <File + RelativePath=".\window\native_frame_view.cc" + > + </File> + <File + RelativePath=".\window\native_frame_view.h" + > + </File> + <File + RelativePath=".\window\non_client_view.cc" + > + </File> + <File + RelativePath=".\window\non_client_view.h" + > + </File> + <File + RelativePath=".\window\window.h" + > + </File> + <File + RelativePath=".\window\window_delegate.cc" + > + </File> + <File + RelativePath=".\window\window_delegate.h" + > + </File> + <File + RelativePath=".\window\window_resources.h" + > + </File> + <File + RelativePath=".\window\window_win.cc" + > + </File> + <File + RelativePath=".\window\window_win.h" + > + </File> + </Filter> <File RelativePath=".\accelerator.cc" > @@ -400,14 +480,6 @@ > </File> <File - RelativePath=".\client_view.cc" - > - </File> - <File - RelativePath=".\client_view.h" - > - </File> - <File RelativePath=".\combo_box.cc" > </File> @@ -428,14 +500,6 @@ > </File> <File - RelativePath=".\custom_frame_view.cc" - > - </File> - <File - RelativePath=".\custom_frame_view.h" - > - </File> - <File RelativePath=".\decision.cc" > </File> @@ -444,22 +508,6 @@ > </File> <File - RelativePath=".\dialog_client_view.cc" - > - </File> - <File - RelativePath=".\dialog_client_view.h" - > - </File> - <File - RelativePath=".\dialog_delegate.cc" - > - </File> - <File - RelativePath=".\dialog_delegate.h" - > - </File> - <File RelativePath=".\event.cc" > </File> @@ -592,14 +640,6 @@ > </File> <File - RelativePath=".\native_frame_view.cc" - > - </File> - <File - RelativePath=".\native_frame_view.h" - > - </File> - <File RelativePath=".\native_scroll_bar.cc" > </File> @@ -608,14 +648,6 @@ > </File> <File - RelativePath=".\non_client_view.cc" - > - </File> - <File - RelativePath=".\non_client_view.h" - > - </File> - <File RelativePath=".\painter.cc" > </File> @@ -779,30 +811,6 @@ RelativePath=".\view_win.cc" > </File> - <File - RelativePath=".\window.h" - > - </File> - <File - RelativePath=".\window_delegate.cc" - > - </File> - <File - RelativePath=".\window_delegate.h" - > - </File> - <File - RelativePath=".\window_resources.h" - > - </File> - <File - RelativePath=".\window_win.cc" - > - </File> - <File - RelativePath=".\window_win.h" - > - </File> </Files> <Globals> </Globals> diff --git a/chrome/views/widget/accelerator_handler.h b/chrome/views/widget/accelerator_handler.h index f71be26..6c2278c 100644 --- a/chrome/views/widget/accelerator_handler.h +++ b/chrome/views/widget/accelerator_handler.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 CHROME_VIEWS_ACCELERATOR_HANDLER_H__ -#define CHROME_VIEWS_ACCELERATOR_HANDLER_H__ +#ifndef CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_ +#define CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_ #include "base/message_loop.h" @@ -27,4 +27,4 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher { } // namespace views -#endif // CHROME_VIEWS_ACCELERATOR_HANDLER_H__ +#endif // CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_ diff --git a/chrome/views/widget/aero_tooltip_manager.h b/chrome/views/widget/aero_tooltip_manager.h index 17fab05..fac5a39 100644 --- a/chrome/views/widget/aero_tooltip_manager.h +++ b/chrome/views/widget/aero_tooltip_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 CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__ -#define CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__ +#ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ +#define CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ #include "base/ref_counted.h" #include "base/task.h" @@ -54,4 +54,4 @@ class AeroTooltipManager : public TooltipManager { } // namespace views -#endif // #ifndef CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__ +#endif // #ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_ diff --git a/chrome/views/widget/hwnd_notification_source.h b/chrome/views/widget/hwnd_notification_source.h index 9f33c2b..602ae44 100644 --- a/chrome/views/widget/hwnd_notification_source.h +++ b/chrome/views/widget/hwnd_notification_source.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 CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ -#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ +#ifndef CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_ +#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_ #include "chrome/common/notification_source.h" @@ -21,4 +21,4 @@ class Source<HWND> : public NotificationSource { HWND ptr() const { return static_cast<HWND>(ptr_); } }; -#endif // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ +#endif // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_ diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h index 57ea710..a97f2ec 100644 --- a/chrome/views/widget/root_view.h +++ b/chrome/views/widget/root_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 CHROME_VIEWS_ROOT_VIEW_H__ -#define CHROME_VIEWS_ROOT_VIEW_H__ +#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_ +#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_ #include "base/ref_counted.h" #include "chrome/views/focus_manager.h" @@ -355,4 +355,4 @@ class RootView : public View, } // namespace views -#endif // CHROME_VIEWS_ROOT_VIEW_H__ +#endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_H_ diff --git a/chrome/views/widget/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h index 72a5a87..02ce6c6 100644 --- a/chrome/views/widget/root_view_drop_target.h +++ b/chrome/views/widget/root_view_drop_target.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 CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__ -#define CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__ +#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_ +#define CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_ #include <atlbase.h> #include <atlapp.h> @@ -72,4 +72,4 @@ class RootViewDropTarget : public BaseDropTarget { } // namespace views -#endif // CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__ +#endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_ diff --git a/chrome/views/widget/tooltip_manager.h b/chrome/views/widget/tooltip_manager.h index 2800fb0..312e30e 100644 --- a/chrome/views/widget/tooltip_manager.h +++ b/chrome/views/widget/tooltip_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 CHROME_VIEWS_TOOLTIP_MANAGER_H_ -#define CHROME_VIEWS_TOOLTIP_MANAGER_H_ +#ifndef CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ +#define CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ #include <windows.h> #include <string> @@ -153,7 +153,7 @@ class TooltipManager { // control window for tooltip displayed using keyboard. HWND keyboard_tooltip_hwnd_; - // Used to register DestroyTooltipWindow function with postdelayedtask + // Used to register DestroyTooltipWindow function with PostDelayedTask // function. ScopedRunnableMethodFactory<TooltipManager> keyboard_tooltip_factory_; @@ -162,4 +162,4 @@ class TooltipManager { } // namespace views -#endif // CHROME_VIEWS_TOOLTIP_MANAGER_H_ +#endif // CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ diff --git a/chrome/views/widget/widget.h b/chrome/views/widget/widget.h index 46aa754..d1d0fff 100644 --- a/chrome/views/widget/widget.h +++ b/chrome/views/widget/widget.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 CHROME_VIEWS_WIDGET_H_ -#define CHROME_VIEWS_WIDGET_H_ +#ifndef CHROME_VIEWS_WIDGET_WIDGET_H_ +#define CHROME_VIEWS_WIDGET_WIDGET_H_ #include "base/gfx/native_widget_types.h" @@ -82,4 +82,4 @@ class Widget { } // namespace views -#endif // CHROME_VIEWS_WIDGET_H_ +#endif // CHROME_VIEWS_WIDGET_WIDGET_H_ diff --git a/chrome/views/widget/widget_win.h b/chrome/views/widget/widget_win.h index d5d5bad..c9fe810 100644 --- a/chrome/views/widget/widget_win.h +++ b/chrome/views/widget/widget_win.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 CHROME_VIEWS_WIDGET_WIN_H_ -#define CHROME_VIEWS_WIDGET_WIN_H_ +#ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_ +#define CHROME_VIEWS_WIDGET_WIDGET_WIN_H_ #include <atlbase.h> #include <atlcrack.h> @@ -632,4 +632,4 @@ class WidgetWin : public Widget, } // namespace views -#endif // #ifndef CHROME_VIEWS_WIDGET_WIN_H_ +#endif // #ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_ diff --git a/chrome/views/app_modal_dialog_delegate.h b/chrome/views/window/app_modal_dialog_delegate.h index 399b593..6ccfc28 100644 --- a/chrome/views/app_modal_dialog_delegate.h +++ b/chrome/views/window/app_modal_dialog_delegate.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__ -#define CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__ +#ifndef CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_ +#define CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_ -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" namespace views { @@ -21,4 +21,4 @@ class AppModalDialogDelegate : public DialogDelegate { } // namespace views -#endif // #ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__ +#endif // #ifndef CHROME_VIEWS_WINDOW_APP_MODAL_DIALOG_DELEGATE_H_ diff --git a/chrome/views/client_view.cc b/chrome/views/window/client_view.cc index 319dd56..37ae937 100644 --- a/chrome/views/client_view.cc +++ b/chrome/views/window/client_view.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/logging.h" -#include "chrome/views/client_view.h" -#include "chrome/views/window.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window.h" +#include "chrome/views/window/window_delegate.h" namespace views { diff --git a/chrome/views/client_view.h b/chrome/views/window/client_view.h index b9b60e3..9db0c69 100644 --- a/chrome/views/client_view.h +++ b/chrome/views/window/client_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 CHROME_VIEWS_CLIENT_VIEW_H_ -#define CHROME_VIEWS_CLIENT_VIEW_H_ +#ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_ +#define CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_ #include "chrome/views/view.h" @@ -81,4 +81,4 @@ class ClientView : public View { } // namespace views -#endif // #ifndef CHROME_VIEWS_CLIENT_VIEW_H_ +#endif // #ifndef CHROME_VIEWS_WINDOW_CLIENT_VIEW_H_ diff --git a/chrome/views/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc index d330be0..d3843a4 100644 --- a/chrome/views/custom_frame_view.cc +++ b/chrome/views/window/custom_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 "chrome/views/custom_frame_view.h" +#include "chrome/views/window/custom_frame_view.h" #include "base/win_util.h" #include "chrome/common/gfx/path.h" @@ -10,8 +10,8 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/client_view.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window_delegate.h" #include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/custom_frame_view.h b/chrome/views/window/custom_frame_view.h index 2edc3f9..9b06c3f 100644 --- a/chrome/views/custom_frame_view.h +++ b/chrome/views/window/custom_frame_view.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_ -#define CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_ +#ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ +#define CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ #include "chrome/views/image_button.h" -#include "chrome/views/non_client_view.h" -#include "chrome/views/window.h" -#include "chrome/views/window_resources.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" +#include "chrome/views/window/window_resources.h" namespace gfx{ class Size; @@ -119,4 +119,4 @@ class CustomFrameView : public NonClientFrameView, } // namespace views -#endif // #ifndef CHROME_VIEWS_CUSTOM_FRAME_VIEW_H_ +#endif // #ifndef CHROME_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ diff --git a/chrome/views/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc index 74732a3..dbc3b179 100644 --- a/chrome/views/dialog_client_view.cc +++ b/chrome/views/window/dialog_client_view.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/views/window/dialog_client_view.h" + #include <windows.h> #include <uxtheme.h> #include <vsstyle.h> -#include "chrome/views/dialog_client_view.h" - #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" @@ -15,8 +15,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/dialog_delegate.h" -#include "chrome/views/window.h" +#include "chrome/views/window/dialog_delegate.h" +#include "chrome/views/window/window.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/dialog_client_view.h b/chrome/views/window/dialog_client_view.h index e8bbdc2..0b4da5f 100644 --- a/chrome/views/dialog_client_view.h +++ b/chrome/views/window/dialog_client_view.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_ -#define CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_ +#ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ +#define CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ #include "chrome/common/gfx/chrome_font.h" -#include "chrome/views/client_view.h" #include "chrome/views/focus_manager.h" #include "chrome/views/native_button.h" +#include "chrome/views/window/client_view.h" namespace views { @@ -119,4 +119,4 @@ class DialogClientView : public ClientView, } // namespace views -#endif // #ifndef CHROME_VIEWS_DIALOG_CLIENT_VIEW_H_ +#endif // #ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ diff --git a/chrome/views/dialog_delegate.cc b/chrome/views/window/dialog_delegate.cc index d873318..8a1c671 100644 --- a/chrome/views/dialog_delegate.cc +++ b/chrome/views/window/dialog_delegate.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/dialog_delegate.h" +#include "chrome/views/window/dialog_delegate.h" #include "base/logging.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" namespace views { diff --git a/chrome/views/dialog_delegate.h b/chrome/views/window/dialog_delegate.h index d077e60..b8b2d1b 100644 --- a/chrome/views/dialog_delegate.h +++ b/chrome/views/window/dialog_delegate.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_DIALOG_DELEGATE_H_ -#define CHROME_VIEWS_DIALOG_DELEGATE_H_ +#ifndef CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_ +#define CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_ -#include "chrome/views/dialog_client_view.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/dialog_client_view.h" +#include "chrome/views/window/window_delegate.h" namespace views { @@ -108,4 +108,4 @@ class DialogDelegate : public WindowDelegate { } // namespace views -#endif // CHROME_VIEWS_DIALOG_DELEGATE_H_ +#endif // CHROME_VIEWS_WINDOW_DIALOG_DELEGATE_H_ diff --git a/chrome/views/native_frame_view.cc b/chrome/views/window/native_frame_view.cc index 898e105..4446f30 100644 --- a/chrome/views/native_frame_view.cc +++ b/chrome/views/window/native_frame_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/native_frame_view.h" +#include "chrome/views/window/native_frame_view.h" -#include "chrome/views/window_win.h" +#include "chrome/views/window/window_win.h" namespace views { diff --git a/chrome/views/native_frame_view.h b/chrome/views/window/native_frame_view.h index c13784d..336d7c4 100644 --- a/chrome/views/native_frame_view.h +++ b/chrome/views/window/native_frame_view.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_NATIVE_FRAME_VIEW_H_ -#define CHROME_VIEWS_NATIVE_FRAME_VIEW_H_ +#ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ +#define CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ -#include "chrome/views/non_client_view.h" +#include "chrome/views/window/non_client_view.h" namespace views { @@ -36,4 +36,4 @@ class NativeFrameView : public NonClientFrameView { } // namespace views -#endif // #ifndef CHROME_VIEWS_NATIVE_FRAME_VIEW_H_ +#endif // #ifndef CHROME_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ diff --git a/chrome/views/non_client_view.cc b/chrome/views/window/non_client_view.cc index c234f23..327656b 100644 --- a/chrome/views/non_client_view.cc +++ b/chrome/views/window/non_client_view.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/non_client_view.h" +#include "chrome/views/window/non_client_view.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget.h" -#include "chrome/views/window.h" +#include "chrome/views/window/window.h" namespace views { diff --git a/chrome/views/non_client_view.h b/chrome/views/window/non_client_view.h index d2ed5c1..45a089f 100644 --- a/chrome/views/non_client_view.h +++ b/chrome/views/window/non_client_view.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_NON_CLIENT_VIEW_H_ -#define CHROME_VIEWS_NON_CLIENT_VIEW_H_ +#ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ +#define CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ #include "base/task.h" #include "chrome/views/view.h" -#include "chrome/views/client_view.h" +#include "chrome/views/window/client_view.h" namespace gfx { class Path; @@ -218,4 +218,4 @@ class NonClientView : public View { } // namespace views -#endif // #ifndef CHROME_VIEWS_NON_CLIENT_VIEW_H_ +#endif // #ifndef CHROME_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ diff --git a/chrome/views/window.h b/chrome/views/window/window.h index 6ac5fb7..48c1ad8 100644 --- a/chrome/views/window.h +++ b/chrome/views/window/window.h @@ -2,8 +2,8 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#ifndef CHROME_VIEWS_WINDOW_H__ -#define CHROME_VIEWS_WINDOW_H__ +#ifndef CHROME_VIEWS_WINDOW_WINDOW_H_ +#define CHROME_VIEWS_WINDOW_WINDOW_H_ #include "base/gfx/native_widget_types.h" @@ -115,4 +115,4 @@ class Window { } // namespace views -#endif // #ifndef CHROME_VIEWS_WINDOW_H__ +#endif // #ifndef CHROME_VIEWS_WINDOW_WINDOW_H_ diff --git a/chrome/views/window_delegate.cc b/chrome/views/window/window_delegate.cc index 1ac5d31..917836f 100644 --- a/chrome/views/window_delegate.cc +++ b/chrome/views/window/window_delegate.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/window_delegate.h" // TODO(beng): hrmp. Fix this in http://crbug.com/4406 #include "chrome/browser/browser_process.h" #include "chrome/common/pref_service.h" -#include "chrome/views/client_view.h" -#include "chrome/views/window.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/window.h" #include "skia/include/SkBitmap.h" namespace views { diff --git a/chrome/views/window_delegate.h b/chrome/views/window/window_delegate.h index 985ed60..52dd86a8 100644 --- a/chrome/views/window_delegate.h +++ b/chrome/views/window/window_delegate.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 CHROME_VIEWS_WINDOW_DELEGATE_H_ -#define CHROME_VIEWS_WINDOW_DELEGATE_H_ +#ifndef CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_ +#define CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_ #include <string> @@ -159,4 +159,4 @@ class WindowDelegate { } // namespace views -#endif // CHROME_VIEWS_WINDOW_DELEGATE_H_ +#endif // CHROME_VIEWS_WINDOW_WINDOW_DELEGATE_H_ diff --git a/chrome/views/window_resources.h b/chrome/views/window/window_resources.h index 6face56..9db078e 100644 --- a/chrome/views/window_resources.h +++ b/chrome/views/window/window_resources.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 CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_ -#define CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_ +#ifndef CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_ +#define CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_ class SkBitmap; @@ -27,4 +27,4 @@ class WindowResources { } // namespace views -#endif // CHROME_BROWSER_VIEWS_WINDOW_RESOURCES_H_ +#endif // CHROME_VIEWS_WINDOW_WINDOW_RESOURCES_H_ diff --git a/chrome/views/window_win.cc b/chrome/views/window/window_win.cc index fda6eb7..7d2fc9a 100644 --- a/chrome/views/window_win.cc +++ b/chrome/views/window/window_win.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 "chrome/views/window_win.h" +#include "chrome/views/window/window_win.h" #include <shellapi.h> @@ -17,12 +17,12 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/client_view.h" -#include "chrome/views/custom_frame_view.h" -#include "chrome/views/native_frame_view.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/widget/root_view.h" -#include "chrome/views/window_delegate.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/custom_frame_view.h" +#include "chrome/views/window/native_frame_view.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window_delegate.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/window_win.h b/chrome/views/window/window_win.h index 7b27ee0..6c33093 100644 --- a/chrome/views/window_win.h +++ b/chrome/views/window/window_win.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_WINDOW_WIN_H__ -#define CHROME_VIEWS_WINDOW_WIN_H__ +#ifndef CHROME_VIEWS_WINDOW_WINDOW_WIN_H__ +#define CHROME_VIEWS_WINDOW_WINDOW_WIN_H__ #include "chrome/common/notification_registrar.h" -#include "chrome/views/client_view.h" -#include "chrome/views/non_client_view.h" #include "chrome/views/widget/widget_win.h" -#include "chrome/views/window.h" +#include "chrome/views/window/client_view.h" +#include "chrome/views/window/non_client_view.h" +#include "chrome/views/window/window.h" namespace gfx { class Point; @@ -275,4 +275,4 @@ class WindowWin : public WidgetWin, } // namespace views -#endif // CHROME_VIEWS_WINDOW_WIN_H__ +#endif // CHROME_VIEWS_WINDOW_WINDOW_WIN_H__ |