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

Side by Side Diff: chrome/browser/chromeos/status/input_method_menu_button.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/status/input_method_menu_button.h" 5 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 10 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
11 #include "chrome/browser/chromeos/input_method/input_method_util.h" 11 #include "chrome/browser/chromeos/input_method/input_method_util.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 18
19 namespace { 19 namespace {
20 20
21 PrefService* GetPrefService() { 21 PrefService* GetPrefService() {
22 Profile* profile = ProfileManager::GetDefaultProfile(); 22 Profile* profile = ProfileManager::GetDefaultProfile();
23 if (profile) 23 if (profile)
24 return profile->GetPrefs(); 24 return profile->GetPrefs();
25 return NULL; 25 return NULL;
26 } 26 }
27 27
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 const input_method::InputMethodDescriptor& input_method = 156 const input_method::InputMethodDescriptor& input_method =
157 input_method_manager->current_input_method(); 157 input_method_manager->current_input_method();
158 const string16 name = InputMethodMenu::GetTextForIndicator(input_method); 158 const string16 name = InputMethodMenu::GetTextForIndicator(input_method);
159 const string16 tooltip = InputMethodMenu::GetTextForMenu(input_method); 159 const string16 tooltip = InputMethodMenu::GetTextForMenu(input_method);
160 const size_t num_active_input_methods = 160 const size_t num_active_input_methods =
161 input_method_manager->GetNumActiveInputMethods(); 161 input_method_manager->GetNumActiveInputMethods();
162 UpdateUI(input_method.id(), name, tooltip, num_active_input_methods); 162 UpdateUI(input_method.id(), name, tooltip, num_active_input_methods);
163 } 163 }
164 164
165 } // namespace chromeos 165 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/input_method_menu.cc ('k') | chrome/browser/chromeos/status/memory_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698