chrome/browser/profiles/off_the_record_profile_impl.h - Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings.

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix shared build. Created 7 years, 4 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

« chrome/browser/chromeos/login/user_image_manager_impl.cc ('K') | « chrome/browser/chromeos/login/user_image_manager_impl.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | chrome/browser/profiles/profile_impl.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 virtual history::TopSites* GetTopSites() OVERRIDE;	62 virtual history::TopSites* GetTopSites() OVERRIDE;

63 virtual base::FilePath last_selected_directory() OVERRIDE;	63 virtual base::FilePath last_selected_directory() OVERRIDE;

64 virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE;	64 virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE;

65 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;	65 virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;

66 virtual void SetExitType(ExitType exit_type) OVERRIDE;	66 virtual void SetExitType(ExitType exit_type) OVERRIDE;

67 virtual ExitType GetLastSessionExitType() OVERRIDE;	67 virtual ExitType GetLastSessionExitType() OVERRIDE;

68	68

69 #if defined(OS_CHROMEOS)	69 #if defined(OS_CHROMEOS)

70 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;	70 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;

71 virtual void InitChromeOSPreferences() OVERRIDE;	71 virtual void InitChromeOSPreferences() OVERRIDE;

72	72 virtual void MarkCreated() OVERRIDE;

73 virtual void ChangeAppLocale(const std::string& locale,	73 virtual void ChangeAppLocale(const std::string& locale,

74 AppLocaleChangedVia) OVERRIDE;	74 AppLocaleChangedVia) OVERRIDE;

75 virtual void OnLogin() OVERRIDE;	75 virtual void OnLogin() OVERRIDE;

	76 virtual void RespectLocalePreference() OVERRIDE;

	77 virtual void SetGPlusProfileLocale(const std::string&) OVERRIDE;

76 #endif // defined(OS_CHROMEOS)	78 #endif // defined(OS_CHROMEOS)

77	79

78 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;	80 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;

79	81

80 virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;	82 virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;

81 virtual void ClearNetworkingHistorySince(	83 virtual void ClearNetworkingHistorySince(

82 base::Time time,	84 base::Time time,

83 const base::Closure& completion) OVERRIDE;	85 const base::Closure& completion) OVERRIDE;

84 virtual GURL GetHomePage() OVERRIDE;	86 virtual GURL GetHomePage() OVERRIDE;

85	87

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 base::FilePath last_selected_directory_;	139 base::FilePath last_selected_directory_;

138	140

139 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;	141 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

140	142

141 content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_;	143 content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_;

142	144

143 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);	145 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);

144 };	146 };

145	147

146 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_	148 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_

OLD	NEW