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

Side by Side Diff: chrome/browser/dom_ui/history_ui.h

Issue 218001: BrowsingDataRemover* should not be scoped. (Closed)
Patch Set: Make BrowsingDataRemover destructor private Created 11 years, 2 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
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/dom_ui/history_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_DOM_UI_HISTORY_UI_H_ 5 #ifndef CHROME_BROWSER_DOM_UI_HISTORY_UI_H_
6 #define CHROME_BROWSER_DOM_UI_HISTORY_UI_H_ 6 #define CHROME_BROWSER_DOM_UI_HISTORY_UI_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/scoped_ptr.h"
11 #include "chrome/browser/browsing_data_remover.h" 10 #include "chrome/browser/browsing_data_remover.h"
12 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 11 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
13 #include "chrome/browser/dom_ui/dom_ui.h" 12 #include "chrome/browser/dom_ui/dom_ui.h"
14 #include "chrome/browser/cancelable_request.h" 13 #include "chrome/browser/cancelable_request.h"
15 #include "chrome/browser/history/history.h" 14 #include "chrome/browser/history/history.h"
16 #include "chrome/common/notification_registrar.h" 15 #include "chrome/common/notification_registrar.h"
17 16
18 class GURL; 17 class GURL;
19 18
20 class HistoryUIHTMLSource : public ChromeURLDataManager::DataSource { 19 class HistoryUIHTMLSource : public ChromeURLDataManager::DataSource {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 72
74 // Figure out the query options for a month-wide query. 73 // Figure out the query options for a month-wide query.
75 history::QueryOptions CreateMonthQueryOptions(int month); 74 history::QueryOptions CreateMonthQueryOptions(int month);
76 75
77 NotificationRegistrar registrar_; 76 NotificationRegistrar registrar_;
78 77
79 // Current search text. 78 // Current search text.
80 std::wstring search_text_; 79 std::wstring search_text_;
81 80
82 // Browsing history remover 81 // Browsing history remover
83 scoped_ptr<BrowsingDataRemover> remover_; 82 BrowsingDataRemover* remover_;
84 83
85 // Our consumer for the history service. 84 // Our consumer for the history service.
86 CancelableRequestConsumerT<int, 0> cancelable_consumer_; 85 CancelableRequestConsumerT<int, 0> cancelable_consumer_;
87 86
88 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); 87 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
89 }; 88 };
90 89
91 class HistoryUI : public DOMUI { 90 class HistoryUI : public DOMUI {
92 public: 91 public:
93 explicit HistoryUI(TabContents* contents); 92 explicit HistoryUI(TabContents* contents);
94 93
95 // Return the URL for a given search term. 94 // Return the URL for a given search term.
96 static const GURL GetHistoryURLWithSearchText(const std::wstring& text); 95 static const GURL GetHistoryURLWithSearchText(const std::wstring& text);
97 96
98 static bool GetFaviconResourceBytes(std::vector<unsigned char>* bytes); 97 static bool GetFaviconResourceBytes(std::vector<unsigned char>* bytes);
99 98
100 private: 99 private:
101 DISALLOW_COPY_AND_ASSIGN(HistoryUI); 100 DISALLOW_COPY_AND_ASSIGN(HistoryUI);
102 }; 101 };
103 102
104 #endif // CHROME_BROWSER_DOM_UI_HISTORY_UI_H_ 103 #endif // CHROME_BROWSER_DOM_UI_HISTORY_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/dom_ui/history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698