| 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_WEBUI_HISTORY2_UI_H_ | 5 #ifndef CHROME_BROWSER_WEBUI_HISTORY2_UI_H_ |
| 6 #define CHROME_BROWSER_WEBUI_HISTORY2_UI_H_ | 6 #define CHROME_BROWSER_WEBUI_HISTORY2_UI_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/string16.h" | 11 #include "base/string16.h" |
| 12 #include "chrome/browser/cancelable_request.h" | 12 #include "chrome/browser/cancelable_request.h" |
| 13 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" | |
| 14 #include "chrome/browser/history/history.h" | 13 #include "chrome/browser/history/history.h" |
| 14 #include "chrome/browser/webui/chrome_url_data_manager.h" |
| 15 #include "chrome/browser/webui/web_ui.h" | 15 #include "chrome/browser/webui/web_ui.h" |
| 16 #include "chrome/common/notification_registrar.h" | 16 #include "chrome/common/notification_registrar.h" |
| 17 | 17 |
| 18 class GURL; | 18 class GURL; |
| 19 | 19 |
| 20 // Temporary fork for development of new history UI. | 20 // Temporary fork for development of new history UI. |
| 21 // TODO(pamg): merge back in when new UI is complete. | 21 // TODO(pamg): merge back in when new UI is complete. |
| 22 | 22 |
| 23 class HistoryUIHTMLSource2 : public ChromeURLDataManager::DataSource { | 23 class HistoryUIHTMLSource2 : public ChromeURLDataManager::DataSource { |
| 24 public: | 24 public: |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 // Return the URL for a given search term. | 103 // Return the URL for a given search term. |
| 104 static const GURL GetHistoryURLWithSearchText(const string16& text); | 104 static const GURL GetHistoryURLWithSearchText(const string16& text); |
| 105 | 105 |
| 106 static RefCountedMemory* GetFaviconResourceBytes(); | 106 static RefCountedMemory* GetFaviconResourceBytes(); |
| 107 | 107 |
| 108 private: | 108 private: |
| 109 DISALLOW_COPY_AND_ASSIGN(HistoryUI2); | 109 DISALLOW_COPY_AND_ASSIGN(HistoryUI2); |
| 110 }; | 110 }; |
| 111 | 111 |
| 112 #endif // CHROME_BROWSER_WEBUI_HISTORY2_UI_H_ | 112 #endif // CHROME_BROWSER_WEBUI_HISTORY2_UI_H_ |
| OLD | NEW |