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

Side by Side Diff: content/browser/browser_main_runner.cc

Issue 16648002: Enable TsfBridge to re-initialize (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 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
« no previous file with comments | « no previous file | ui/base/ime/win/mock_tsf_bridge.h » ('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) 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 #include "content/public/browser/browser_main_runner.h" 5 #include "content/public/browser/browser_main_runner.h"
6 6
7 #include "base/allocator/allocator_shim.h" 7 #include "base/allocator/allocator_shim.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 virtual void Shutdown() OVERRIDE { 120 virtual void Shutdown() OVERRIDE {
121 DCHECK(is_initialized_); 121 DCHECK(is_initialized_);
122 DCHECK(!is_shutdown_); 122 DCHECK(!is_shutdown_);
123 g_exited_main_message_loop = true; 123 g_exited_main_message_loop = true;
124 124
125 if (created_threads_) 125 if (created_threads_)
126 main_loop_->ShutdownThreadsAndCleanUp(); 126 main_loop_->ShutdownThreadsAndCleanUp();
127 127
128 #if defined(OS_WIN) 128 #if defined(OS_WIN)
129 if (base::win::IsTSFAwareRequired()) 129 if (base::win::IsTSFAwareRequired())
130 ui::TSFBridge::GetInstance()->Shutdown(); 130 ui::TSFBridge::Shutdown();
131 ole_initializer_.reset(NULL); 131 ole_initializer_.reset(NULL);
132 #endif 132 #endif
133 133
134 main_loop_.reset(NULL); 134 main_loop_.reset(NULL);
135 135
136 notification_service_.reset(NULL); 136 notification_service_.reset(NULL);
137 137
138 is_shutdown_ = true; 138 is_shutdown_ = true;
139 } 139 }
140 140
(...skipping 15 matching lines...) Expand all
156 156
157 DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl); 157 DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
158 }; 158 };
159 159
160 // static 160 // static
161 BrowserMainRunner* BrowserMainRunner::Create() { 161 BrowserMainRunner* BrowserMainRunner::Create() {
162 return new BrowserMainRunnerImpl(); 162 return new BrowserMainRunnerImpl();
163 } 163 }
164 164
165 } // namespace content 165 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/base/ime/win/mock_tsf_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698