Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 9582041: Move most of ui/views/drag_utils to ui/base/dragdrop so it can be used outside of views. I tried to… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "content/public/browser/page_navigator.h" 42 #include "content/public/browser/page_navigator.h"
43 #include "content/public/browser/render_widget_host_view.h" 43 #include "content/public/browser/render_widget_host_view.h"
44 #include "content/public/browser/user_metrics.h" 44 #include "content/public/browser/user_metrics.h"
45 #include "content/public/browser/web_contents.h" 45 #include "content/public/browser/web_contents.h"
46 #include "content/public/common/page_transition_types.h" 46 #include "content/public/common/page_transition_types.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 #include "grit/theme_resources.h" 48 #include "grit/theme_resources.h"
49 #include "grit/ui_resources.h" 49 #include "grit/ui_resources.h"
50 #include "ui/base/accessibility/accessible_view_state.h" 50 #include "ui/base/accessibility/accessible_view_state.h"
51 #include "ui/base/animation/slide_animation.h" 51 #include "ui/base/animation/slide_animation.h"
52 #include "ui/base/dragdrop/drag_utils.h"
52 #include "ui/base/dragdrop/os_exchange_data.h" 53 #include "ui/base/dragdrop/os_exchange_data.h"
53 #include "ui/base/l10n/l10n_util.h" 54 #include "ui/base/l10n/l10n_util.h"
54 #include "ui/base/resource/resource_bundle.h" 55 #include "ui/base/resource/resource_bundle.h"
55 #include "ui/base/text/text_elider.h" 56 #include "ui/base/text/text_elider.h"
56 #include "ui/gfx/canvas_skia.h" 57 #include "ui/gfx/canvas_skia.h"
58 #include "ui/views/button_drag_utils.h"
57 #include "ui/views/controls/button/menu_button.h" 59 #include "ui/views/controls/button/menu_button.h"
58 #include "ui/views/controls/label.h" 60 #include "ui/views/controls/label.h"
59 #include "ui/views/controls/menu/menu_item_view.h" 61 #include "ui/views/controls/menu/menu_item_view.h"
60 #include "ui/views/drag_utils.h"
61 #include "ui/views/metrics.h" 62 #include "ui/views/metrics.h"
62 #include "ui/views/view_constants.h" 63 #include "ui/views/view_constants.h"
63 #include "ui/views/widget/tooltip_manager.h" 64 #include "ui/views/widget/tooltip_manager.h"
64 #include "ui/views/widget/widget.h" 65 #include "ui/views/widget/widget.h"
65 66
66 using content::OpenURLParams; 67 using content::OpenURLParams;
67 using content::PageNavigator; 68 using content::PageNavigator;
68 using content::Referrer; 69 using content::Referrer;
69 using content::UserMetricsAction; 70 using content::UserMetricsAction;
70 using views::CustomButton; 71 using views::CustomButton;
(...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 (1 - size_animation_->GetCurrentValue()))); 1663 (1 - size_animation_->GetCurrentValue())));
1663 } else { 1664 } else {
1664 prefsize.set_height( 1665 prefsize.set_height(
1665 static_cast<int>( 1666 static_cast<int>(
1666 browser_defaults::kBookmarkBarHeight * 1667 browser_defaults::kBookmarkBarHeight *
1667 size_animation_->GetCurrentValue())); 1668 size_animation_->GetCurrentValue()));
1668 } 1669 }
1669 } 1670 }
1670 return prefsize; 1671 return prefsize;
1671 } 1672 }
OLDNEW
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698