summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/SConscript24
-rw-r--r--chrome/views/focus/external_focus_tracker.cc (renamed from chrome/views/external_focus_tracker.cc)4
-rw-r--r--chrome/views/focus/external_focus_tracker.h (renamed from chrome/views/external_focus_tracker.h)8
-rw-r--r--chrome/views/focus/focus_manager.cc (renamed from chrome/views/focus_manager.cc)4
-rw-r--r--chrome/views/focus/focus_manager.h (renamed from chrome/views/focus_manager.h)4
-rw-r--r--chrome/views/focus/view_storage.cc (renamed from chrome/views/view_storage.cc)2
-rw-r--r--chrome/views/focus/view_storage.h (renamed from chrome/views/view_storage.h)4
-rw-r--r--chrome/views/hwnd_view.cc2
-rw-r--r--chrome/views/native_control.cc2
-rw-r--r--chrome/views/tree_view.cc2
-rw-r--r--chrome/views/views.vcproj52
-rw-r--r--chrome/views/widget/accelerator_handler.cc2
-rw-r--r--chrome/views/widget/root_view.h2
-rw-r--r--chrome/views/widget/widget_win.h2
-rw-r--r--chrome/views/window/dialog_client_view.h2
15 files changed, 60 insertions, 56 deletions
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index 412efcd..c891c2f 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -65,10 +65,12 @@ input_files = ChromeFileList([
'decision.h',
'event.cc',
'event.h',
- 'external_focus_tracker.cc',
- 'external_focus_tracker.h',
- 'focus_manager.cc',
- 'focus_manager.h',
+ 'focus/external_focus_tracker.cc',
+ 'focus/external_focus_tracker.h',
+ 'focus/focus_manager.cc',
+ 'focus/focus_manager.h',
+ 'focus/view_storage.cc',
+ 'focus/view_storage.h',
'grid_layout.cc',
'grid_layout.h',
'group_table_view.cc',
@@ -133,8 +135,6 @@ input_files = ChromeFileList([
'view_constants.cc',
'view_constants.h',
'view_menu_delegate.h',
- 'view_storage.cc',
- 'view_storage.h',
'widget/accelerator_handler.cc',
'widget/accelerator_handler.h',
'widget/aero_tooltip_manager.cc',
@@ -195,7 +195,8 @@ if env.Bit('linux'):
# input_files.Remove(
# 'background.cc',
# 'border.cc',
-# 'external_focus_tracker.cc',
+# 'focus/external_focus_tracker.cc',
+# 'focus/view_storage.cc',
# 'grid_layout.cc',
# 'image_view.cc',
# 'label.cc',
@@ -206,7 +207,6 @@ if env.Bit('linux'):
# 'scroll_view.cc',
# 'throbber.cc',
# 'view.cc',
-# 'view_storage.cc',
# 'widget/root_view.cc',
# )
@@ -224,7 +224,7 @@ if env.Bit('linux'):
'combo_box.cc',
'decision.cc',
'event.cc',
- 'focus_manager.cc',
+ 'focus/focus_manager.cc',
'group_table_view.cc',
'hwnd_view.cc',
'link.cc',
@@ -276,8 +276,9 @@ if env.Bit('mac'):
'combo_box.cc',
'decision.cc',
'event.cc',
- 'external_focus_tracker.cc',
- 'focus_manager.cc',
+ 'focus/external_focus_tracker.cc',
+ 'focus/focus_manager.cc',
+ 'focus/view_storage.cc',
'grid_layout.cc',
'group_table_view.cc',
'hwnd_view.cc',
@@ -306,7 +307,6 @@ if env.Bit('mac'):
'throbber.cc',
'tree_view.cc',
'view.cc',
- 'view_storage.cc',
'widget/aero_tooltip_manager.cc',
'widget/root_view.cc',
'widget/root_view_drop_target.cc',
diff --git a/chrome/views/external_focus_tracker.cc b/chrome/views/focus/external_focus_tracker.cc
index 088693a..89ea93e 100644
--- a/chrome/views/external_focus_tracker.cc
+++ b/chrome/views/focus/external_focus_tracker.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/external_focus_tracker.h"
+#include "chrome/views/focus/external_focus_tracker.h"
#include "chrome/views/view.h"
-#include "chrome/views/view_storage.h"
+#include "chrome/views/focus/view_storage.h"
namespace views {
diff --git a/chrome/views/external_focus_tracker.h b/chrome/views/focus/external_focus_tracker.h
index 68ae265..01bb864 100644
--- a/chrome/views/external_focus_tracker.h
+++ b/chrome/views/focus/external_focus_tracker.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_BROWSER_VIEWS_EXTERNAL_FOCUS_TRACKER_H__
-#define CHROME_BROWSER_VIEWS_EXTERNAL_FOCUS_TRACKER_H__
+#ifndef CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
+#define CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
namespace views {
@@ -73,4 +73,4 @@ class ExternalFocusTracker : public FocusChangeListener {
} // namespace views
-#endif // CHROME_BROWSER_VIEWS_EXTERNAL_FOCUS_TRACKER_H__
+#endif // CHROME_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
diff --git a/chrome/views/focus_manager.cc b/chrome/views/focus/focus_manager.cc
index 1af79a6..e11d43f 100644
--- a/chrome/views/focus_manager.cc
+++ b/chrome/views/focus/focus_manager.cc
@@ -10,9 +10,9 @@
#include "chrome/browser/renderer_host/render_widget_host_view_win.h"
#include "chrome/common/notification_service.h"
#include "chrome/views/accelerator.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
+#include "chrome/views/focus/view_storage.h"
#include "chrome/views/view.h"
-#include "chrome/views/view_storage.h"
#include "chrome/views/widget/root_view.h"
#include "chrome/views/widget/widget.h"
diff --git a/chrome/views/focus_manager.h b/chrome/views/focus/focus_manager.h
index 652e6e7..491cbbb 100644
--- a/chrome/views/focus_manager.h
+++ b/chrome/views/focus/focus_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_FOCUS_MANAGER_H_
-#define CHROME_VIEWS_FOCUS_MANAGER_H_
+#ifndef CHROME_VIEWS_FOCUS_FOCUS_MANAGER_H_
+#define CHROME_VIEWS_FOCUS_FOCUS_MANAGER_H_
#include "base/basictypes.h"
diff --git a/chrome/views/view_storage.cc b/chrome/views/focus/view_storage.cc
index 42396b8..94826ea 100644
--- a/chrome/views/view_storage.cc
+++ b/chrome/views/focus/view_storage.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/view_storage.h"
+#include "chrome/views/focus/view_storage.h"
#include <algorithm>
diff --git a/chrome/views/view_storage.h b/chrome/views/focus/view_storage.h
index 8b17474..cb0cb67 100644
--- a/chrome/views/view_storage.h
+++ b/chrome/views/focus/view_storage.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_VIEW_STORAGE_H_
-#define CHROME_VIEWS_VIEW_STORAGE_H_
+#ifndef CHROME_VIEWS_FOCUS_VIEW_STORAGE_H_
+#define CHROME_VIEWS_FOCUS_VIEW_STORAGE_H_
#include "base/singleton.h"
#include "chrome/common/notification_observer.h"
diff --git a/chrome/views/hwnd_view.cc b/chrome/views/hwnd_view.cc
index 43e6c89..107581d 100644
--- a/chrome/views/hwnd_view.cc
+++ b/chrome/views/hwnd_view.cc
@@ -6,7 +6,7 @@
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/win_util.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/scroll_view.h"
#include "chrome/views/widget/widget.h"
#include "base/logging.h"
diff --git a/chrome/views/native_control.cc b/chrome/views/native_control.cc
index d50f500..0e1e72e 100644
--- a/chrome/views/native_control.cc
+++ b/chrome/views/native_control.cc
@@ -15,7 +15,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/views/background.h"
#include "chrome/views/border.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/hwnd_view.h"
#include "chrome/views/widget/widget.h"
#include "base/gfx/native_theme.h"
diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc
index d476611..04cac8c 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/tree_view.cc
@@ -12,7 +12,7 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/resource_bundle.h"
#include "chrome/common/stl_util-inl.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/widget/widget.h"
#include "grit/theme_resources.h"
diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj
index a9c31cb..ea740d4 100644
--- a/chrome/views/views.vcproj
+++ b/chrome/views/views.vcproj
@@ -411,6 +411,34 @@
>
</File>
</Filter>
+ <Filter
+ Name="focus"
+ >
+ <File
+ RelativePath=".\focus\external_focus_tracker.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\focus\external_focus_tracker.h"
+ >
+ </File>
+ <File
+ RelativePath=".\focus\focus_manager.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\focus\focus_manager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\focus\view_storage.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\focus\view_storage.h"
+ >
+ </File>
+ </Filter>
<File
RelativePath=".\accelerator.cc"
>
@@ -516,22 +544,6 @@
>
</File>
<File
- RelativePath=".\external_focus_tracker.cc"
- >
- </File>
- <File
- RelativePath=".\external_focus_tracker.h"
- >
- </File>
- <File
- RelativePath=".\focus_manager.cc"
- >
- </File>
- <File
- RelativePath=".\focus_manager.h"
- >
- </File>
- <File
RelativePath=".\grid_layout.cc"
>
</File>
@@ -800,14 +812,6 @@
>
</File>
<File
- RelativePath=".\view_storage.cc"
- >
- </File>
- <File
- RelativePath=".\view_storage.h"
- >
- </File>
- <File
RelativePath=".\view_win.cc"
>
</File>
diff --git a/chrome/views/widget/accelerator_handler.cc b/chrome/views/widget/accelerator_handler.cc
index 847a311..39b17f8 100644
--- a/chrome/views/widget/accelerator_handler.cc
+++ b/chrome/views/widget/accelerator_handler.cc
@@ -4,7 +4,7 @@
#include "chrome/views/widget/accelerator_handler.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
namespace views {
diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
index a97f2ec..802e7b5 100644
--- a/chrome/views/widget/root_view.h
+++ b/chrome/views/widget/root_view.h
@@ -6,7 +6,7 @@
#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
#include "base/ref_counted.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/view.h"
namespace views {
diff --git a/chrome/views/widget/widget_win.h b/chrome/views/widget/widget_win.h
index c9fe810..d7ff51b 100644
--- a/chrome/views/widget/widget_win.h
+++ b/chrome/views/widget/widget_win.h
@@ -10,7 +10,7 @@
#include "base/message_loop.h"
#include "base/system_monitor.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/layout_manager.h"
#include "chrome/views/widget/widget.h"
diff --git a/chrome/views/window/dialog_client_view.h b/chrome/views/window/dialog_client_view.h
index 0b4da5f..ed6ca00 100644
--- a/chrome/views/window/dialog_client_view.h
+++ b/chrome/views/window/dialog_client_view.h
@@ -6,7 +6,7 @@
#define CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
#include "chrome/common/gfx/chrome_font.h"
-#include "chrome/views/focus_manager.h"
+#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/native_button.h"
#include "chrome/views/window/client_view.h"
generated by cgit v1.1 at 2025-01-20 13:48:25 +0000