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

Side by Side Diff: chrome/browser/chromeos/input_method/ibus_ui_controller.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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 | Annotate | Revision Log
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/chromeos/input_method/ibus_ui_controller.h" 5 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
6 6
7 #if defined(HAVE_IBUS) 7 #if defined(HAVE_IBUS)
8 #include <ibus.h> 8 #include <ibus.h>
9 #endif 9 #endif
10 10
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 } 333 }
334 334
335 IBusUiControllerImpl* ui_; 335 IBusUiControllerImpl* ui_;
336 }; 336 };
337 337
338 // Returns a ui::InputMethodIBus object which is associated with the root 338 // Returns a ui::InputMethodIBus object which is associated with the root
339 // window. Returns NULL if the Ash shell has already been destructed. 339 // window. Returns NULL if the Ash shell has already been destructed.
340 static ui::InputMethodIBus* GetChromeInputMethod() { 340 static ui::InputMethodIBus* GetChromeInputMethod() {
341 if (!ash::Shell::HasInstance()) 341 if (!ash::Shell::HasInstance())
342 return NULL; 342 return NULL;
343 aura::Window* root_window = ash::Shell::GetRootWindow(); 343 aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
344 if (!root_window) 344 if (!root_window)
345 return NULL; 345 return NULL;
346 return static_cast<ui::InputMethodIBus*>(root_window->GetProperty( 346 return static_cast<ui::InputMethodIBus*>(root_window->GetProperty(
347 aura::client::kRootWindowInputMethodKey)); 347 aura::client::kRootWindowInputMethodKey));
348 } 348 }
349 349
350 // Functions that end with Thunk are used to deal with glib callbacks. 350 // Functions that end with Thunk are used to deal with glib callbacks.
351 // 351 //
352 // Note that we cannot use CHROMEG_CALLBACK_0() here as we'll define 352 // Note that we cannot use CHROMEG_CALLBACK_0() here as we'll define
353 // IBusBusConnected() inline. If we are to define the function outside 353 // IBusBusConnected() inline. If we are to define the function outside
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 IBusUiController::~IBusUiController() { 751 IBusUiController::~IBusUiController() {
752 } 752 }
753 753
754 bool IsActiveForTesting(const std::string& input_method_id, 754 bool IsActiveForTesting(const std::string& input_method_id,
755 const InputMethodDescriptors* descriptors) { 755 const InputMethodDescriptors* descriptors) {
756 return IsActive(input_method_id, descriptors); 756 return IsActive(input_method_id, descriptors);
757 } 757 }
758 758
759 } // namespace input_method 759 } // namespace input_method
760 } // namespace chromeos 760 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/browser/chromeos/login/language_switch_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698