OLD | NEW |
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 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/sync/profile_sync_service.h" | 25 #include "chrome/browser/sync/profile_sync_service.h" |
26 #include "chrome/browser/sync/profile_sync_service_factory.h" | 26 #include "chrome/browser/sync/profile_sync_service_factory.h" |
27 #include "chrome/browser/themes/theme_service.h" | 27 #include "chrome/browser/themes/theme_service.h" |
28 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 28 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
29 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
30 #include "chrome/browser/ui/browser_tabstrip.h" | 30 #include "chrome/browser/ui/browser_tabstrip.h" |
31 #include "chrome/browser/ui/chrome_pages.h" | 31 #include "chrome/browser/ui/chrome_pages.h" |
32 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 32 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
33 #include "chrome/browser/ui/view_ids.h" | 33 #include "chrome/browser/ui/view_ids.h" |
| 34 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" |
34 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" | 35 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" |
35 #include "chrome/browser/ui/views/event_utils.h" | 36 #include "chrome/browser/ui/views/event_utils.h" |
36 #include "chrome/browser/ui/views/frame/browser_view.h" | 37 #include "chrome/browser/ui/views/frame/browser_view.h" |
37 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 38 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
38 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" | 39 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" |
39 #include "chrome/common/chrome_notification_types.h" | 40 #include "chrome/common/chrome_notification_types.h" |
40 #include "chrome/common/chrome_switches.h" | 41 #include "chrome/common/chrome_switches.h" |
41 #include "chrome/common/extensions/extension_constants.h" | 42 #include "chrome/common/extensions/extension_constants.h" |
42 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
43 #include "content/public/browser/notification_details.h" | 44 #include "content/public/browser/notification_details.h" |
(...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1680 (1 - size_animation_->GetCurrentValue()))); | 1681 (1 - size_animation_->GetCurrentValue()))); |
1681 } else { | 1682 } else { |
1682 prefsize.set_height( | 1683 prefsize.set_height( |
1683 static_cast<int>( | 1684 static_cast<int>( |
1684 browser_defaults::kBookmarkBarHeight * | 1685 browser_defaults::kBookmarkBarHeight * |
1685 size_animation_->GetCurrentValue())); | 1686 size_animation_->GetCurrentValue())); |
1686 } | 1687 } |
1687 } | 1688 } |
1688 return prefsize; | 1689 return prefsize; |
1689 } | 1690 } |
OLD | NEW |