summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_runner.cc
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 17:51:28 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 17:51:28 +0000
commit06b61d9b949354608e2c2325da6a086582ac8581 (patch)
treea24434b510c57557b21e1544618e7894e09b9fe0 /content/browser/browser_main_runner.cc
parent40cb85ee3a816f20b324b8b4e9fc195e4b5a966d (diff)
downloadchromium_src-06b61d9b949354608e2c2325da6a086582ac8581.zip
chromium_src-06b61d9b949354608e2c2325da6a086582ac8581.tar.gz
chromium_src-06b61d9b949354608e2c2325da6a086582ac8581.tar.bz2
Clean Up: TSF related stuff
This clean up CL contains: 1. Rename TSF acronym from Tsf to TSF based on 11141019. 2. Use STDMETHOD_ instead of STDMETHODIMP suggested on 11235023. 3. Use override comment suggested on 11235023 BUG=None TBR=mark@chromium.org TEST=checked on Windows 8 and try bots Review URL: https://chromiumcodereview.appspot.com/11341036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r--content/browser/browser_main_runner.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index a58e566..8aeec88 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -59,7 +59,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
#if defined(OS_WIN)
if (parameters.command_line.HasSwitch(
switches::kEnableTextServicesFramework)) {
- base::win::SetForceToUseTsf();
+ base::win::SetForceToUseTSF();
}
#endif // OS_WIN
@@ -91,8 +91,8 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
base::allocator::SetupSubprocessAllocator();
#endif
ole_initializer_.reset(new ui::ScopedOleInitializer);
- if (base::win::IsTsfAwareRequired())
- ui::TsfBridge::Initialize();
+ if (base::win::IsTSFAwareRequired())
+ ui::TSFBridge::Initialize();
#endif // OS_WIN
#if defined(OS_ANDROID)
@@ -127,8 +127,8 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
main_loop_->ShutdownThreadsAndCleanUp();
#if defined(OS_WIN)
- if (base::win::IsTsfAwareRequired())
- ui::TsfBridge::GetInstance()->Shutdown();
+ if (base::win::IsTSFAwareRequired())
+ ui::TSFBridge::GetInstance()->Shutdown();
ole_initializer_.reset(NULL);
#endif