| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ |
| 6 #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 // Adds "url", "title", and "direction" keys on incoming dictionary, setting | 38 // Adds "url", "title", and "direction" keys on incoming dictionary, setting |
| 39 // title as the url as a fallback on empty title. | 39 // title as the url as a fallback on empty title. |
| 40 static void SetURLTitleAndDirection(base::DictionaryValue* dictionary, | 40 static void SetURLTitleAndDirection(base::DictionaryValue* dictionary, |
| 41 const string16& title, | 41 const string16& title, |
| 42 const GURL& gurl); | 42 const GURL& gurl); |
| 43 | 43 |
| 44 // The current preference version. | 44 // The current preference version. |
| 45 static int current_pref_version() { return current_pref_version_; } | 45 static int current_pref_version() { return current_pref_version_; } |
| 46 | 46 |
| 47 // Returns whether NTP4 bookmark features are enabled. | |
| 48 static bool NTP4BookmarkFeaturesEnabled(); | |
| 49 | |
| 50 class NewTabHTMLSource : public ChromeURLDataManager::DataSource { | 47 class NewTabHTMLSource : public ChromeURLDataManager::DataSource { |
| 51 public: | 48 public: |
| 52 explicit NewTabHTMLSource(Profile* profile); | 49 explicit NewTabHTMLSource(Profile* profile); |
| 53 | 50 |
| 54 // Called when the network layer has requested a resource underneath | 51 // Called when the network layer has requested a resource underneath |
| 55 // the path we registered. | 52 // the path we registered. |
| 56 virtual void StartDataRequest(const std::string& path, | 53 virtual void StartDataRequest(const std::string& path, |
| 57 bool is_incognito, | 54 bool is_incognito, |
| 58 int request_id) OVERRIDE; | 55 int request_id) OVERRIDE; |
| 59 | 56 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 base::TimeTicks last_paint_; | 92 base::TimeTicks last_paint_; |
| 96 // Scoping so we can be sure our timeouts don't outlive us. | 93 // Scoping so we can be sure our timeouts don't outlive us. |
| 97 base::OneShotTimer<NewTabUI> timer_; | 94 base::OneShotTimer<NewTabUI> timer_; |
| 98 // The preference version. This used for migrating prefs of the NTP. | 95 // The preference version. This used for migrating prefs of the NTP. |
| 99 static const int current_pref_version_ = 3; | 96 static const int current_pref_version_ = 3; |
| 100 | 97 |
| 101 DISALLOW_COPY_AND_ASSIGN(NewTabUI); | 98 DISALLOW_COPY_AND_ASSIGN(NewTabUI); |
| 102 }; | 99 }; |
| 103 | 100 |
| 104 #endif // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ | 101 #endif // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_ |
| OLD | NEW |