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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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
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 29 matching lines...) Expand all
40 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" 40 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h"
41 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" 41 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
42 #include "chrome/browser/ui/views/event_utils.h" 42 #include "chrome/browser/ui/views/event_utils.h"
43 #include "chrome/browser/ui/views/frame/browser_view.h" 43 #include "chrome/browser/ui/views/frame/browser_view.h"
44 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 44 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
45 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 45 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
46 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
47 #include "chrome/common/extensions/extension_constants.h" 47 #include "chrome/common/extensions/extension_constants.h"
48 #include "chrome/common/pref_names.h" 48 #include "chrome/common/pref_names.h"
49 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
50 #include "components/bookmarks/core/browser/bookmark_model.h" 50 #include "components/bookmarks/browser/bookmark_model.h"
51 #include "content/public/browser/notification_details.h" 51 #include "content/public/browser/notification_details.h"
52 #include "content/public/browser/notification_source.h" 52 #include "content/public/browser/notification_source.h"
53 #include "content/public/browser/page_navigator.h" 53 #include "content/public/browser/page_navigator.h"
54 #include "content/public/browser/render_view_host.h" 54 #include "content/public/browser/render_view_host.h"
55 #include "content/public/browser/render_widget_host_view.h" 55 #include "content/public/browser/render_widget_host_view.h"
56 #include "content/public/browser/user_metrics.h" 56 #include "content/public/browser/user_metrics.h"
57 #include "content/public/browser/web_contents.h" 57 #include "content/public/browser/web_contents.h"
58 #include "content/public/common/page_transition_types.h" 58 #include "content/public/common/page_transition_types.h"
59 #include "extensions/browser/extension_registry.h" 59 #include "extensions/browser/extension_registry.h"
60 #include "extensions/common/extension.h" 60 #include "extensions/common/extension.h"
(...skipping 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1854 DCHECK(apps_page_shortcut_); 1854 DCHECK(apps_page_shortcut_);
1855 // Only perform layout if required. 1855 // Only perform layout if required.
1856 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( 1856 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar(
1857 browser_->profile(), browser_->host_desktop_type()); 1857 browser_->profile(), browser_->host_desktop_type());
1858 if (apps_page_shortcut_->visible() == visible) 1858 if (apps_page_shortcut_->visible() == visible)
1859 return; 1859 return;
1860 apps_page_shortcut_->SetVisible(visible); 1860 apps_page_shortcut_->SetVisible(visible);
1861 UpdateBookmarksSeparatorVisibility(); 1861 UpdateBookmarksSeparatorVisibility();
1862 Layout(); 1862 Layout();
1863 } 1863 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698