summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/toolbar_view.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 22:14:38 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 22:14:38 +0000
commit91e81aeeccfb493d3503368d7b30a0f3b80a3478 (patch)
tree0d6b7049b614cb9e3aa9f29ff26a7ecaee0d9fc7 /chrome/browser/views/toolbar_view.cc
parent5f9e0b82a61503101a80a3dee4df9f5b7017c8d1 (diff)
downloadchromium_src-91e81aeeccfb493d3503368d7b30a0f3b80a3478.zip
chromium_src-91e81aeeccfb493d3503368d7b30a0f3b80a3478.tar.gz
chromium_src-91e81aeeccfb493d3503368d7b30a0f3b80a3478.tar.bz2
Move color_utils, text_elider, drag_utils, accessibility_types, standard_layout to new locations in app/ and views/
http://crbug.com/11387 Review URL: http://codereview.chromium.org/113143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.cc')
-rw-r--r--chrome/browser/views/toolbar_view.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index f4657eb..38cc412 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/character_encoding.h"
-#include "chrome/browser/drag_utils.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
@@ -50,6 +49,7 @@
#include "views/controls/button/button_dropdown.h"
#include "views/controls/hwnd_view.h"
#include "views/controls/label.h"
+#include "views/drag_utils.h"
#include "views/widget/tooltip_manager.h"
#include "views/window/non_client_view.h"
#include "views/window/window.h"
@@ -829,7 +829,8 @@ void BrowserToolbarView::WriteDragData(views::View* sender,
drag_utils::SetURLAndDragImage(tab_->GetURL(),
UTF16ToWideHack(tab_->GetTitle()),
- tab_->GetFavIcon(), data);
+ tab_->GetFavIcon(),
+ data);
}
TabContents* BrowserToolbarView::GetTabContents() {