| Index: chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
|
| diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
|
| index 23e4669974940e76488bab7a8577f019a93076a3..978f17fec0c754523db4caf6fa0f412ef587f597 100644
|
| --- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
|
| +++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
|
| @@ -6,12 +6,12 @@
|
| #define CHROME_BROWSER_UI_WEBUI_NTP_ANDROID_BOOKMARKS_HANDLER_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/task/cancelable_task_tracker.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/android/bookmarks/managed_bookmarks_shim.h"
|
| #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
|
| #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
|
| #include "chrome/browser/favicon/favicon_service.h"
|
| -#include "chrome/common/cancelable_task_tracker.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
|
|
| // The handler for Javascript messages related to the bookmarks.
|
| @@ -109,7 +109,7 @@ class BookmarksHandler : public content::WebUIMessageHandler,
|
| bool extensive_changes_;
|
|
|
| // Used for loading bookmark node.
|
| - CancelableTaskTracker cancelable_task_tracker_;
|
| + base::CancelableTaskTracker cancelable_task_tracker_;
|
|
|
| // Returns true iff bookmark model and partner bookmarks shim are loaded.
|
| bool AreModelsLoaded() const;
|
|
|