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

Side by Side Diff: chrome/browser/extensions/api/input_ime/input_ime_api.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" 5 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/input_method/input_method_engine.h" 9 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
10 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 10 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 Profile* profile_; 412 Profile* profile_;
413 413
414 DISALLOW_COPY_AND_ASSIGN(ImeObserver); 414 DISALLOW_COPY_AND_ASSIGN(ImeObserver);
415 }; 415 };
416 416
417 } // namespace chromeos 417 } // namespace chromeos
418 418
419 namespace extensions { 419 namespace extensions {
420 420
421 InputImeEventRouterFactory* InputImeEventRouterFactory::GetInstance() { 421 InputImeEventRouterFactory* InputImeEventRouterFactory::GetInstance() {
422 return Singleton<InputImeEventRouterFactory>::get(); 422 return base::Singleton<InputImeEventRouterFactory>::get();
423 } 423 }
424 424
425 InputImeEventRouterFactory::InputImeEventRouterFactory() { 425 InputImeEventRouterFactory::InputImeEventRouterFactory() {
426 } 426 }
427 427
428 InputImeEventRouterFactory::~InputImeEventRouterFactory() { 428 InputImeEventRouterFactory::~InputImeEventRouterFactory() {
429 } 429 }
430 430
431 InputImeEventRouter* InputImeEventRouterFactory::GetRouter(Profile* profile) { 431 InputImeEventRouter* InputImeEventRouterFactory::GetRouter(Profile* profile) {
432 InputImeEventRouter* router = router_map_[profile]; 432 InputImeEventRouter* router = router_map_[profile];
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 InputMethodEngineInterface* engine = 953 InputMethodEngineInterface* engine =
954 GetInputImeEventRouter( 954 GetInputImeEventRouter(
955 Profile::FromBrowserContext(details.browser_context)) 955 Profile::FromBrowserContext(details.browser_context))
956 ->GetActiveEngine(details.extension_id); 956 ->GetActiveEngine(details.extension_id);
957 // Notifies the IME extension for IME ready with onActivate/onFocus events. 957 // Notifies the IME extension for IME ready with onActivate/onFocus events.
958 if (engine) 958 if (engine)
959 engine->Enable(engine->GetActiveComponentId()); 959 engine->Enable(engine->GetActiveComponentId());
960 } 960 }
961 961
962 } // namespace extensions 962 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698