summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_constants.cc2
-rw-r--r--chrome/common/chrome_constants.h2
-rw-r--r--chrome/common/chrome_switches.cc8
-rw-r--r--chrome/common/chrome_switches.h2
-rw-r--r--chrome/common/pref_names.cc13
-rw-r--r--chrome/common/pref_names.h3
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc1
-rw-r--r--chrome/common/temp_scaffolding_stubs.h87
8 files changed, 61 insertions, 57 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 3cf228d..a0ae25b 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -41,7 +41,7 @@ const wchar_t kThumbnailsFilename[] = L"Thumbnails";
const wchar_t kUserDataDirname[] = L"User Data";
const FilePath::CharType kUserScriptsDirname[] = FPL("User Scripts");
const FilePath::CharType kWebDataFilename[] = FPL("Web Data");
-const wchar_t kBookmarksFileName[] = L"Bookmarks";
+const FilePath::CharType kBookmarksFileName[] = FPL("Bookmarks");
const wchar_t kHistoryBookmarksFileName[] = L"Bookmarks From History";
const wchar_t kCustomDictionaryFileName[] = L"Custom Dictionary.txt";
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 51ac806..a752aba 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -36,7 +36,7 @@ extern const wchar_t kThumbnailsFilename[];
extern const wchar_t kUserDataDirname[];
extern const FilePath::CharType kUserScriptsDirname[];
extern const FilePath::CharType kWebDataFilename[];
-extern const wchar_t kBookmarksFileName[];
+extern const FilePath::CharType kBookmarksFileName[];
extern const wchar_t kHistoryBookmarksFileName[];
extern const wchar_t kCustomDictionaryFileName[];
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e694366..c161449 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -141,10 +141,10 @@ const wchar_t kUserAgent[] = L"user-agent";
// Specifies the flags passed to JS engine
const wchar_t kJavaScriptFlags[] = L"js-flags";
-// The GeoID we should use. This is normally obtained from the operating system
-// during first run and cached in the preferences afterwards. This is a numeric
-// value; see http://msdn.microsoft.com/en-us/library/ms776390.aspx .
-const wchar_t kGeoID[] = L"geoid";
+// The Country we should use. This is normally obtained from the operating
+// system during first run and cached in the preferences afterwards. This is a
+// string value, the 2 letter code from ISO 3166-1.
+const wchar_t kCountry[] = L"country";
// The language file that we want to try to open. Of the form
// language[-country] where language is the 2 letter code from ISO-639.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1a2c36c..38228f0 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -47,7 +47,7 @@ extern const wchar_t kDomAutomationController[];
extern const wchar_t kPluginPath[];
extern const wchar_t kUserAgent[];
extern const wchar_t kJavaScriptFlags[];
-extern const wchar_t kGeoID[];
+extern const wchar_t kCountry[];
extern const wchar_t kLang[];
extern const wchar_t kDebugChildren[];
extern const wchar_t kWaitForDebuggerChildren[];
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d44ce18..2e55a6b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -426,11 +426,14 @@ const wchar_t kShouldShowWelcomePage[] = L"show-welcome-page";
// correct Google domain/country code for whatever location the user is in.
const wchar_t kLastKnownGoogleURL[] = L"browser.last_known_google_url";
-// Integer containing the system GeoID the first time we checked the template
-// URL prepopulate data. This is used to avoid adding a whole bunch of new
-// search engine choices if prepopulation runs when the user's GeoID differs
-// from their previous GeoID. This pref does not exist until prepopulation has
-// been run at least once.
+// Integer containing the system Country ID the first time we checked the
+// template URL prepopulate data. This is used to avoid adding a whole bunch of
+// new search engine choices if prepopulation runs when the user's Country ID
+// differs from their previous Country ID. This pref does not exist until
+// prepopulation has been run at least once.
+const wchar_t kCountryIDAtInstall[] = L"countryid_at_install";
+// OBSOLETE. Same as above, but uses the Windows-specific GeoID value instead.
+// Updated if found to the above key.
const wchar_t kGeoIDAtInstall[] = L"geoid_at_install";
// An enum value of how the browser was shut down (see browser_shutdown.h).
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 7db0d1b..f0c514c 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -148,7 +148,8 @@ extern const wchar_t kShouldShowWelcomePage[];
extern const wchar_t kLastKnownGoogleURL[];
-extern const wchar_t kGeoIDAtInstall[];
+extern const wchar_t kCountryIDAtInstall[];
+extern const wchar_t kGeoIDAtInstall[]; // OBSOLETE
extern const wchar_t kShutdownType[];
extern const wchar_t kShutdownNumProcesses[];
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 2216a57..9098742 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/renderer_host/render_widget_helper.h"
#include "chrome/browser/resource_message_filter.h"
#include "chrome/browser/rlz/rlz.h"
+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 09ba200..cab8c87 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -173,6 +173,29 @@ class TabRestoreService : public base::RefCountedThreadSafe<TabRestoreService> {
void CreateHistoricalTab(NavigationController*) { NOTIMPLEMENTED(); }
};
+namespace history {
+
+class ExpireHistoryBackend {
+ public:
+ BookmarkService* bookmark_service_;
+};
+
+class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend> {
+ public:
+ BookmarkService* bookmark_service_;
+ ExpireHistoryBackend expirer_;
+};
+
+class HistoryDatabase {
+ public:
+ static std::string GURLToDatabaseURL(const GURL& url) {
+ NOTIMPLEMENTED();
+ return "";
+ }
+};
+
+}
+
class HistoryService {
public:
class URLEnumerator {
@@ -198,6 +221,13 @@ class HistoryService {
NOTIMPLEMENTED();
}
void IterateURLs(URLEnumerator* iterator) { NOTIMPLEMENTED(); }
+ void DeleteAllSearchTermsForKeyword(long long) { NOTIMPLEMENTED(); }
+ void SetKeywordSearchTermsForURL(const GURL& url,
+ long long keyword_id,
+ const std::wstring& term) {
+ NOTIMPLEMENTED();
+ }
+ void NotifyRenderProcessHostDestruction(int) { NOTIMPLEMENTED(); };
void Cleanup() { NOTIMPLEMENTED(); }
void AddRef() { NOTIMPLEMENTED(); }
void Release() { NOTIMPLEMENTED(); }
@@ -208,17 +238,9 @@ class HistoryService {
void SetPageTitle(const GURL&, const std::wstring&) {
NOTIMPLEMENTED();
}
-};
-namespace history {
-class HistoryDatabase {
- public:
- static std::string GURLToDatabaseURL(const GURL& url) {
- NOTIMPLEMENTED();
- return "";
- }
+ scoped_refptr<history::HistoryBackend> history_backend_;
};
-}
class MetricsService {
public:
@@ -822,6 +844,12 @@ class Encryptor {
}
};
+class BookmarkNode {
+};
+
+class BookmarkModelObserver {
+};
+
class BookmarkModel : public BookmarkService {
public:
explicit BookmarkModel(Profile* profile) { }
@@ -832,7 +860,13 @@ class BookmarkModel : public BookmarkService {
return false;
}
virtual void GetBookmarks(std::vector<GURL>* urls) { NOTIMPLEMENTED(); }
+ virtual bool IsLoaded() {
+ NOTIMPLEMENTED();
+ return false;
+ }
virtual void BlockTillLoaded() { NOTIMPLEMENTED(); }
+ void AddObserver(BookmarkModelObserver* observer) { NOTIMPLEMENTED(); }
+ void RemoveObserver(BookmarkModelObserver* observer) { NOTIMPLEMENTED(); }
};
class SpellChecker : public base::RefCountedThreadSafe<SpellChecker> {
@@ -870,41 +904,6 @@ class URLFixerUpper {
}
};
-class TemplateURLModel {
- public:
- explicit TemplateURLModel(Profile* profile) { }
- static std::wstring GenerateKeyword(const GURL& url, bool autodetected) {
- NOTIMPLEMENTED();
- return L"";
- }
- static GURL GenerateSearchURL(const TemplateURL* t_url) {
- NOTIMPLEMENTED();
- return GURL();
- }
- TemplateURL* GetDefaultSearchProvider() {
- NOTIMPLEMENTED();
- return NULL;
- }
- bool loaded() const {
- NOTIMPLEMENTED();
- return false;
- }
- void Load() { NOTIMPLEMENTED(); }
- TemplateURL* GetTemplateURLForKeyword(const std::wstring&) {
- NOTIMPLEMENTED();
- return NULL;
- }
- void ScheduleDownload(const std::wstring&, const GURL&, const GURL&,
- const gfx::NativeView, bool) { NOTIMPLEMENTED(); }
- bool CanReplaceKeyword(const std::wstring&, const std::wstring&,
- const TemplateURL**) {
- NOTIMPLEMENTED();
- return false;
- }
- void Remove(const TemplateURL*) { NOTIMPLEMENTED(); }
- void Add(const TemplateURL*) { NOTIMPLEMENTED(); }
-};
-
//---------------------------------------------------------------------------
// These stubs are for WebContents
generated by cgit v1.1 at 2025-01-19 07:02:03 +0000