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

Side by Side Diff: chrome/browser/search_engines/template_url_prepopulate_data.h

Issue 10451068: Fixing gcc 4.7 building problems. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Modified per Adam's comments Created 8 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_ 5 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_ 6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 #include <cstddef>
brettw 2012/05/29 19:30:46 C++ includes should go together and be in order (s
Han 2012/05/29 20:57:04 Done.
12 13
13 #include "base/string16.h" 14 #include "base/string16.h"
14 #include "chrome/browser/search_engines/search_engine_type.h" 15 #include "chrome/browser/search_engines/search_engine_type.h"
15 16
16 class GURL; 17 class GURL;
17 class PrefService; 18 class PrefService;
18 class Profile; 19 class Profile;
19 class TemplateURL; 20 class TemplateURL;
20 21
21 namespace TemplateURLPrepopulateData { 22 namespace TemplateURLPrepopulateData {
(...skipping 30 matching lines...) Expand all
52 // returns the string in IDS_UNKNOWN_SEARCH_ENGINE_NAME. 53 // returns the string in IDS_UNKNOWN_SEARCH_ENGINE_NAME.
53 string16 GetEngineName(const std::string& url); 54 string16 GetEngineName(const std::string& url);
54 55
55 // Returns the type of the matching engine, or SEARCH_ENGINE_OTHER if no engines 56 // Returns the type of the matching engine, or SEARCH_ENGINE_OTHER if no engines
56 // match. 57 // match.
57 SearchEngineType GetEngineType(const std::string& url); 58 SearchEngineType GetEngineType(const std::string& url);
58 59
59 } // namespace TemplateURLPrepopulateData 60 } // namespace TemplateURLPrepopulateData
60 61
61 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_ 62 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698