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

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

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deps Created 8 years, 6 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "content/public/browser/notification_source.h" 43 #include "content/public/browser/notification_source.h"
44 #include "content/public/browser/page_navigator.h" 44 #include "content/public/browser/page_navigator.h"
45 #include "content/public/browser/render_view_host.h" 45 #include "content/public/browser/render_view_host.h"
46 #include "content/public/browser/render_widget_host_view.h" 46 #include "content/public/browser/render_widget_host_view.h"
47 #include "content/public/browser/user_metrics.h" 47 #include "content/public/browser/user_metrics.h"
48 #include "content/public/browser/web_contents.h" 48 #include "content/public/browser/web_contents.h"
49 #include "content/public/common/page_transition_types.h" 49 #include "content/public/common/page_transition_types.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/theme_resources.h" 51 #include "grit/theme_resources.h"
52 #include "grit/theme_resources_standard.h" 52 #include "grit/theme_resources_standard.h"
53 #include "grit/ui_resources.h" 53 #include "grit/ui_resources_standard.h"
54 #include "ui/base/accessibility/accessible_view_state.h" 54 #include "ui/base/accessibility/accessible_view_state.h"
55 #include "ui/base/animation/slide_animation.h" 55 #include "ui/base/animation/slide_animation.h"
56 #include "ui/base/dragdrop/drag_utils.h" 56 #include "ui/base/dragdrop/drag_utils.h"
57 #include "ui/base/dragdrop/os_exchange_data.h" 57 #include "ui/base/dragdrop/os_exchange_data.h"
58 #include "ui/base/l10n/l10n_util.h" 58 #include "ui/base/l10n/l10n_util.h"
59 #include "ui/base/resource/resource_bundle.h" 59 #include "ui/base/resource/resource_bundle.h"
60 #include "ui/base/text/text_elider.h" 60 #include "ui/base/text/text_elider.h"
61 #include "ui/gfx/canvas.h" 61 #include "ui/gfx/canvas.h"
62 #include "ui/views/button_drag_utils.h" 62 #include "ui/views/button_drag_utils.h"
63 #include "ui/views/controls/button/menu_button.h" 63 #include "ui/views/controls/button/menu_button.h"
(...skipping 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 (1 - size_animation_->GetCurrentValue()))); 1680 (1 - size_animation_->GetCurrentValue())));
1681 } else { 1681 } else {
1682 prefsize.set_height( 1682 prefsize.set_height(
1683 static_cast<int>( 1683 static_cast<int>(
1684 browser_defaults::kBookmarkBarHeight * 1684 browser_defaults::kBookmarkBarHeight *
1685 size_animation_->GetCurrentValue())); 1685 size_animation_->GetCurrentValue()));
1686 } 1686 }
1687 } 1687 }
1688 return prefsize; 1688 return prefsize;
1689 } 1689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698