A new DEPS file for views, designed to reduce dependencies. Removes some unnecessary includes too.

http://crbug.com/11387

Review URL: http://codereview.chromium.org/115114

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15610 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 44 insertions, 22 deletions

diff --git a/views/DEPS b/views/DEPS
index 8ff5f48..e28b897 100644
--- a/views/DEPS
+++ b/views/DEPS
@@ -1,12 +1,37 @@
-include_rules = [

-  "+app",

-  "+chrome/app",

-  "+chrome/app/theme",

-  "+chrome/browser",

-  "+chrome/browser/views",

-  "+chrome/common",

-  "+grit",  # For generated headers

-  "+skia/ext",

-  "+skia/include",

-  "+webkit/glue",

-]

+include_rules = [
+  "+app",
+  "+skia/ext",
+  "+skia/include",
+  
+  # TODO(beng): sever these dependencies into chrome by either refactoring or
+  #             moving code into app/
+  
+  # view.h
+  "+chrome/common/accessibility_types.h",
+  
+  # view_unittest.cc
+  "+chrome/browser/browser_process.h",
+  
+  # label.cc
+  "+chrome/common/gfx/text_elider.h",
+  
+  # message_box_view.cc
+  "+chrome/browser/views/standard_layout.h",
+  
+  # text_field.cc
+  "+chrome/common/win_util.h",
+  
+  # widget_win.cc
+  "+chrome/app/chrome_dll_resource.h",
+  
+  # window_delegate.cc
+  "+chrome/common/pref_service.h",
+  
+  # chrome_menu.cc
+  "+chrome/browser/drag_utils.h",
+  "+chrome/common/gfx/color_utils.h",
+
+  # TODO(beng): swap these with app/views specific generated resources.
+  "+grit/generated_resources.h",
+  "+grit/theme_resources.h",
+]
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 5653e7a..a7859f2 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -7,7 +7,6 @@
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/win_util.h"
-#include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "views/accelerator.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/view_storage.h"
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index d509940e..11d5821 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -6,8 +6,6 @@
 #include "app/gfx/path.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
@@ -601,7 +599,7 @@ TEST_F(ViewTest, TextFieldCutCopyPaste) {
   const std::wstring kReadOnlyText = L"Read only";
   const std::wstring kPasswordText = L"Password! ** Secret stuff **";
 
-  Clipboard* clipboard = g_browser_process->clipboard();
+  Clipboard clipboard;
 
   WidgetWin* window = new WidgetWin;
   window->Init(NULL, gfx::Rect(0, 0, 100, 100), true);
@@ -628,7 +626,7 @@ TEST_F(ViewTest, TextFieldCutCopyPaste) {
   ::SendMessage(normal->GetNativeComponent(), WM_CUT, 0, 0);
 
   string16 result;
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   EXPECT_EQ(kNormalText, result);
   normal->SetText(kNormalText);  // Let's revert to the original content.
 
@@ -636,7 +634,7 @@ TEST_F(ViewTest, TextFieldCutCopyPaste) {
   read_only->SelectAll();
   ::SendMessage(read_only->GetNativeComponent(), WM_CUT, 0, 0);
   result.clear();
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
@@ -644,7 +642,7 @@ TEST_F(ViewTest, TextFieldCutCopyPaste) {
   password->SelectAll();
   ::SendMessage(password->GetNativeComponent(), WM_CUT, 0, 0);
   result.clear();
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
@@ -657,19 +655,19 @@ TEST_F(ViewTest, TextFieldCutCopyPaste) {
   read_only->SelectAll();
   ::SendMessage(read_only->GetNativeComponent(), WM_COPY, 0, 0);
   result.clear();
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   EXPECT_EQ(kReadOnlyText, result);
 
   normal->SelectAll();
   ::SendMessage(normal->GetNativeComponent(), WM_COPY, 0, 0);
   result.clear();
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   EXPECT_EQ(kNormalText, result);
 
   password->SelectAll();
   ::SendMessage(password->GetNativeComponent(), WM_COPY, 0, 0);
   result.clear();
-  clipboard->ReadText(&result);
+  clipboard.ReadText(&result);
   // We don't let you copy from a password field, clipboard should not have
   // changed.
   EXPECT_EQ(kNormalText, result);