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

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

Issue 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm todos Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/bookmarks/bookmark_model.h" 17 #include "chrome/browser/bookmarks/bookmark_model.h"
18 #include "chrome/browser/bookmarks/bookmark_utils.h" 18 #include "chrome/browser/bookmarks/bookmark_utils.h"
19 #include "chrome/browser/browser_shutdown.h" 19 #include "chrome/browser/browser_shutdown.h"
20 #include "chrome/browser/defaults.h" 20 #include "chrome/browser/defaults.h"
21 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/browser/prefs/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/sync/profile_sync_service.h" 24 #include "chrome/browser/sync/profile_sync_service.h"
25 #include "chrome/browser/sync/profile_sync_service_factory.h"
25 #include "chrome/browser/themes/theme_service.h" 26 #include "chrome/browser/themes/theme_service.h"
26 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
27 #include "chrome/browser/ui/browser.h" 28 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
29 #include "chrome/browser/ui/view_ids.h" 30 #include "chrome/browser/ui/view_ids.h"
30 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" 31 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
31 #include "chrome/browser/ui/views/event_utils.h" 32 #include "chrome/browser/ui/views/event_utils.h"
32 #include "chrome/browser/ui/views/frame/browser_view.h" 33 #include "chrome/browser/ui/views/frame/browser_view.h"
33 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 34 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
34 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 void BookmarkBarView::BookmarkNodeAddedImpl(BookmarkModel* model, 1249 void BookmarkBarView::BookmarkNodeAddedImpl(BookmarkModel* model,
1249 const BookmarkNode* parent, 1250 const BookmarkNode* parent,
1250 int index) { 1251 int index) {
1251 UpdateOtherBookmarksVisibility(); 1252 UpdateOtherBookmarksVisibility();
1252 if (parent != model_->bookmark_bar_node()) { 1253 if (parent != model_->bookmark_bar_node()) {
1253 // We only care about nodes on the bookmark bar. 1254 // We only care about nodes on the bookmark bar.
1254 return; 1255 return;
1255 } 1256 }
1256 DCHECK(index >= 0 && index <= GetBookmarkButtonCount()); 1257 DCHECK(index >= 0 && index <= GetBookmarkButtonCount());
1257 const BookmarkNode* node = parent->GetChild(index); 1258 const BookmarkNode* node = parent->GetChild(index);
1258 ProfileSyncService* sync_service = 1259 ProfileSyncService* sync_service(ProfileSyncServiceFactory::
1259 browser_->profile()->GetProfileSyncService(); 1260 GetInstance()->GetForProfile(browser_->profile()));
1260 if (!throbbing_view_ && sync_service && sync_service->SetupInProgress()) 1261 if (!throbbing_view_ && sync_service && sync_service->SetupInProgress())
1261 StartThrobbing(node, true); 1262 StartThrobbing(node, true);
1262 AddChildViewAt(CreateBookmarkButton(node), index); 1263 AddChildViewAt(CreateBookmarkButton(node), index);
1263 UpdateColors(); 1264 UpdateColors();
1264 Layout(); 1265 Layout();
1265 SchedulePaint(); 1266 SchedulePaint();
1266 } 1267 }
1267 1268
1268 void BookmarkBarView::BookmarkNodeRemovedImpl(BookmarkModel* model, 1269 void BookmarkBarView::BookmarkNodeRemovedImpl(BookmarkModel* model,
1269 const BookmarkNode* parent, 1270 const BookmarkNode* parent,
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 (1 - size_animation_->GetCurrentValue()))); 1662 (1 - size_animation_->GetCurrentValue())));
1662 } else { 1663 } else {
1663 prefsize.set_height( 1664 prefsize.set_height(
1664 static_cast<int>( 1665 static_cast<int>(
1665 browser_defaults::kBookmarkBarHeight * 1666 browser_defaults::kBookmarkBarHeight *
1666 size_animation_->GetCurrentValue())); 1667 size_animation_->GetCurrentValue()));
1667 } 1668 }
1668 } 1669 }
1669 return prefsize; 1670 return prefsize;
1670 } 1671 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/webui/ntp/foreign_session_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698