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

Side by Side Diff: components/enhanced_bookmarks/bookmark_server_service.cc

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/enhanced_bookmarks/bookmark_server_service.h" 5 #include "components/enhanced_bookmarks/bookmark_server_service.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h" 8 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
9 #include "components/signin/core/browser/profile_oauth2_token_service.h" 9 #include "components/signin/core/browser/profile_oauth2_token_service.h"
10 #include "components/signin/core/browser/signin_manager_base.h" 10 #include "components/signin/core/browser/signin_manager_base.h"
11 #include "google_apis/gaia/gaia_constants.h" 11 #include "google_apis/gaia/gaia_constants.h"
12 #include "net/base/load_flags.h" 12 #include "net/base/load_flags.h"
13 #include "net/url_request/url_request_context_getter.h" 13 #include "net/url_request/url_request_context_getter.h"
14 #include "ui/base/models/tree_node_iterator.h" 14 #include "ui/base/models/tree_node_iterator.h"
15 15
16 using bookmarks::BookmarkNode;
17
16 namespace enhanced_bookmarks { 18 namespace enhanced_bookmarks {
17 19
18 BookmarkServerService::BookmarkServerService( 20 BookmarkServerService::BookmarkServerService(
19 scoped_refptr<net::URLRequestContextGetter> request_context_getter, 21 scoped_refptr<net::URLRequestContextGetter> request_context_getter,
20 ProfileOAuth2TokenService* token_service, 22 ProfileOAuth2TokenService* token_service,
21 SigninManagerBase* signin_manager, 23 SigninManagerBase* signin_manager,
22 EnhancedBookmarkModel* enhanced_bookmark_model) 24 EnhancedBookmarkModel* enhanced_bookmark_model)
23 : OAuth2TokenService::Consumer("bookmark_server_service"), 25 : OAuth2TokenService::Consumer("bookmark_server_service"),
24 model_(enhanced_bookmark_model), 26 model_(enhanced_bookmark_model),
25 token_service_(token_service), 27 token_service_(token_service),
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 void BookmarkServerService::EnhancedBookmarkModelShuttingDown() { 150 void BookmarkServerService::EnhancedBookmarkModelShuttingDown() {
149 NOTREACHED(); 151 NOTREACHED();
150 } 152 }
151 153
152 SigninManagerBase* BookmarkServerService::GetSigninManager() { 154 SigninManagerBase* BookmarkServerService::GetSigninManager() {
153 DCHECK(signin_manager_); 155 DCHECK(signin_manager_);
154 return signin_manager_; 156 return signin_manager_;
155 } 157 }
156 158
157 } // namespace enhanced_bookmarks 159 } // namespace enhanced_bookmarks
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698