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 <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" | 42 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" |
43 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 43 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
44 #include "chrome/browser/ui/views/event_utils.h" | 44 #include "chrome/browser/ui/views/event_utils.h" |
45 #include "chrome/browser/ui/views/frame/browser_view.h" | 45 #include "chrome/browser/ui/views/frame/browser_view.h" |
46 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 46 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
47 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 47 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
48 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/extensions/extension_constants.h" | 49 #include "chrome/common/extensions/extension_constants.h" |
50 #include "chrome/common/pref_names.h" | 50 #include "chrome/common/pref_names.h" |
51 #include "chrome/common/url_constants.h" | 51 #include "chrome/common/url_constants.h" |
| 52 #include "chrome/grit/generated_resources.h" |
52 #include "components/bookmarks/browser/bookmark_model.h" | 53 #include "components/bookmarks/browser/bookmark_model.h" |
53 #include "components/metrics/metrics_service.h" | 54 #include "components/metrics/metrics_service.h" |
54 #include "content/public/browser/notification_details.h" | 55 #include "content/public/browser/notification_details.h" |
55 #include "content/public/browser/notification_source.h" | 56 #include "content/public/browser/notification_source.h" |
56 #include "content/public/browser/page_navigator.h" | 57 #include "content/public/browser/page_navigator.h" |
57 #include "content/public/browser/render_view_host.h" | 58 #include "content/public/browser/render_view_host.h" |
58 #include "content/public/browser/render_widget_host_view.h" | 59 #include "content/public/browser/render_widget_host_view.h" |
59 #include "content/public/browser/user_metrics.h" | 60 #include "content/public/browser/user_metrics.h" |
60 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
61 #include "content/public/common/page_transition_types.h" | 62 #include "content/public/common/page_transition_types.h" |
62 #include "extensions/browser/extension_registry.h" | 63 #include "extensions/browser/extension_registry.h" |
63 #include "extensions/common/extension.h" | 64 #include "extensions/common/extension.h" |
64 #include "extensions/common/extension_set.h" | 65 #include "extensions/common/extension_set.h" |
65 #include "grit/generated_resources.h" | |
66 #include "grit/theme_resources.h" | 66 #include "grit/theme_resources.h" |
67 #include "ui/accessibility/ax_view_state.h" | 67 #include "ui/accessibility/ax_view_state.h" |
68 #include "ui/base/dragdrop/drag_utils.h" | 68 #include "ui/base/dragdrop/drag_utils.h" |
69 #include "ui/base/dragdrop/os_exchange_data.h" | 69 #include "ui/base/dragdrop/os_exchange_data.h" |
70 #include "ui/base/l10n/l10n_util.h" | 70 #include "ui/base/l10n/l10n_util.h" |
71 #include "ui/base/resource/resource_bundle.h" | 71 #include "ui/base/resource/resource_bundle.h" |
72 #include "ui/base/theme_provider.h" | 72 #include "ui/base/theme_provider.h" |
73 #include "ui/base/window_open_disposition.h" | 73 #include "ui/base/window_open_disposition.h" |
74 #include "ui/gfx/animation/slide_animation.h" | 74 #include "ui/gfx/animation/slide_animation.h" |
75 #include "ui/gfx/canvas.h" | 75 #include "ui/gfx/canvas.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 ShortcutButton(views::ButtonListener* listener, | 261 ShortcutButton(views::ButtonListener* listener, |
262 const base::string16& title) | 262 const base::string16& title) |
263 : BookmarkButtonBase(listener, title) { | 263 : BookmarkButtonBase(listener, title) { |
264 } | 264 } |
265 | 265 |
266 virtual const char* GetClassName() const OVERRIDE { | 266 virtual const char* GetClassName() const OVERRIDE { |
267 return kViewClassName; | 267 return kViewClassName; |
268 } | 268 } |
269 | 269 |
270 private: | 270 private: |
271 | |
272 DISALLOW_COPY_AND_ASSIGN(ShortcutButton); | 271 DISALLOW_COPY_AND_ASSIGN(ShortcutButton); |
273 }; | 272 }; |
274 | 273 |
275 // static | 274 // static |
276 const char ShortcutButton::kViewClassName[] = "ShortcutButton"; | 275 const char ShortcutButton::kViewClassName[] = "ShortcutButton"; |
277 | 276 |
278 // BookmarkFolderButton ------------------------------------------------------- | 277 // BookmarkFolderButton ------------------------------------------------------- |
279 | 278 |
280 // Buttons used for folders on the bookmark bar, including the 'other folders' | 279 // Buttons used for folders on the bookmark bar, including the 'other folders' |
281 // button. | 280 // button. |
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1957 DCHECK(apps_page_shortcut_); | 1956 DCHECK(apps_page_shortcut_); |
1958 // Only perform layout if required. | 1957 // Only perform layout if required. |
1959 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( | 1958 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( |
1960 browser_->profile(), browser_->host_desktop_type()); | 1959 browser_->profile(), browser_->host_desktop_type()); |
1961 if (apps_page_shortcut_->visible() == visible) | 1960 if (apps_page_shortcut_->visible() == visible) |
1962 return; | 1961 return; |
1963 apps_page_shortcut_->SetVisible(visible); | 1962 apps_page_shortcut_->SetVisible(visible); |
1964 UpdateBookmarksSeparatorVisibility(); | 1963 UpdateBookmarksSeparatorVisibility(); |
1965 Layout(); | 1964 Layout(); |
1966 } | 1965 } |
OLD | NEW |