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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <limits> 10 #include <limits>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/common/extensions/extension_constants.h" 51 #include "chrome/common/extensions/extension_constants.h"
52 #include "chrome/common/extensions/extension_metrics.h" 52 #include "chrome/common/extensions/extension_metrics.h"
53 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
54 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
55 #include "chrome/grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
56 #include "chrome/grit/theme_resources.h" 56 #include "chrome/grit/theme_resources.h"
57 #include "components/bookmarks/browser/bookmark_model.h" 57 #include "components/bookmarks/browser/bookmark_model.h"
58 #include "components/bookmarks/browser/bookmark_utils.h" 58 #include "components/bookmarks/browser/bookmark_utils.h"
59 #include "components/bookmarks/common/bookmark_pref_names.h" 59 #include "components/bookmarks/common/bookmark_pref_names.h"
60 #include "components/bookmarks/managed/managed_bookmark_service.h" 60 #include "components/bookmarks/managed/managed_bookmark_service.h"
61 #include "components/browser_sync/browser/profile_sync_service.h" 61 #include "components/browser_sync/profile_sync_service.h"
62 #include "components/metrics/metrics_service.h" 62 #include "components/metrics/metrics_service.h"
63 #include "components/omnibox/browser/omnibox_popup_model.h" 63 #include "components/omnibox/browser/omnibox_popup_model.h"
64 #include "components/omnibox/browser/omnibox_view.h" 64 #include "components/omnibox/browser/omnibox_view.h"
65 #include "components/prefs/pref_service.h" 65 #include "components/prefs/pref_service.h"
66 #include "components/url_formatter/elide_url.h" 66 #include "components/url_formatter/elide_url.h"
67 #include "content/public/browser/notification_details.h" 67 #include "content/public/browser/notification_details.h"
68 #include "content/public/browser/notification_source.h" 68 #include "content/public/browser/notification_source.h"
69 #include "content/public/browser/page_navigator.h" 69 #include "content/public/browser/page_navigator.h"
70 #include "content/public/browser/render_view_host.h" 70 #include "content/public/browser/render_view_host.h"
71 #include "content/public/browser/render_widget_host_view.h" 71 #include "content/public/browser/render_widget_host_view.h"
(...skipping 2115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2187 return; 2187 return;
2188 apps_page_shortcut_->SetVisible(visible); 2188 apps_page_shortcut_->SetVisible(visible);
2189 UpdateBookmarksSeparatorVisibility(); 2189 UpdateBookmarksSeparatorVisibility();
2190 LayoutAndPaint(); 2190 LayoutAndPaint();
2191 } 2191 }
2192 2192
2193 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() { 2193 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
2194 if (UpdateOtherAndManagedButtonsVisibility()) 2194 if (UpdateOtherAndManagedButtonsVisibility())
2195 LayoutAndPaint(); 2195 LayoutAndPaint();
2196 } 2196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698