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

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/android/bookmarks/bookmarks_bridge.h" 5 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 int BookmarksBridge::GetBookmarkType(const BookmarkNode* node) { 274 int BookmarksBridge::GetBookmarkType(const BookmarkNode* node) {
275 if (managed_bookmarks_shim_->IsManagedBookmark(node)) 275 if (managed_bookmarks_shim_->IsManagedBookmark(node))
276 return kBookmarkTypeManaged; 276 return kBookmarkTypeManaged;
277 else if (partner_bookmarks_shim_->IsPartnerBookmark(node)) 277 else if (partner_bookmarks_shim_->IsPartnerBookmark(node))
278 return kBookmarkTypePartner; 278 return kBookmarkTypePartner;
279 else 279 else
280 return kBookmarkTypeNormal; 280 return kBookmarkTypeNormal;
281 } 281 }
282 282
283 string16 BookmarksBridge::GetTitle(const BookmarkNode* node) const { 283 base::string16 BookmarksBridge::GetTitle(const BookmarkNode* node) const {
284 if (partner_bookmarks_shim_->IsPartnerBookmark(node)) 284 if (partner_bookmarks_shim_->IsPartnerBookmark(node))
285 return partner_bookmarks_shim_->GetTitle(node); 285 return partner_bookmarks_shim_->GetTitle(node);
286 return node->GetTitle(); 286 return node->GetTitle();
287 } 287 }
288 288
289 bool BookmarksBridge::IsReachable(const BookmarkNode* node) const { 289 bool BookmarksBridge::IsReachable(const BookmarkNode* node) const {
290 if (!partner_bookmarks_shim_->IsPartnerBookmark(node)) 290 if (!partner_bookmarks_shim_->IsPartnerBookmark(node))
291 return true; 291 return true;
292 return partner_bookmarks_shim_->IsReachable(node); 292 return partner_bookmarks_shim_->IsReachable(node);
293 } 293 }
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 BookmarkModelChanged(); 467 BookmarkModelChanged();
468 } 468 }
469 469
470 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 470 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
471 NotifyIfDoneLoading(); 471 NotifyIfDoneLoading();
472 } 472 }
473 473
474 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 474 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
475 partner_bookmarks_shim_ = NULL; 475 partner_bookmarks_shim_ = NULL;
476 } 476 }
OLDNEW
« no previous file with comments | « chrome/browser/android/bookmarks/bookmarks_bridge.h ('k') | chrome/browser/android/bookmarks/managed_bookmarks_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698