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

Side by Side Diff: chrome/browser/chromeos/status/input_method_menu.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.h" 5 #include "chrome/browser/chromeos/status/input_method_menu.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string_split.h" 10 #include "base/string_split.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chromeos/input_method/input_method_util.h" 15 #include "chrome/browser/chromeos/input_method/input_method_util.h"
16 #include "chrome/browser/chromeos/language_preferences.h" 16 #include "chrome/browser/chromeos/language_preferences.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "content/browser/user_metrics.h" 20 #include "content/browser/user_metrics.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/models/simple_menu_model.h" 25 #include "ui/base/models/simple_menu_model.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/views/widget/widget.h"
27 #include "views/controls/menu/menu_model_adapter.h" 28 #include "views/controls/menu/menu_model_adapter.h"
28 #include "views/controls/menu/menu_runner.h" 29 #include "views/controls/menu/menu_runner.h"
29 #include "views/controls/menu/submenu_view.h" 30 #include "views/controls/menu/submenu_view.h"
30 #include "views/widget/widget.h"
31 31
32 // The language menu consists of 3 parts (in this order): 32 // The language menu consists of 3 parts (in this order):
33 // 33 //
34 // (1) input method names. The size of the list is always >= 1. 34 // (1) input method names. The size of the list is always >= 1.
35 // (2) input method properties. This list might be empty. 35 // (2) input method properties. This list might be empty.
36 // (3) "Customize language and input..." button. 36 // (3) "Customize language and input..." button.
37 // 37 //
38 // Example of the menu (Japanese): 38 // Example of the menu (Japanese):
39 // 39 //
40 // ============================== (border of the popup window) 40 // ============================== (border of the popup window)
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 if (screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_VIEWS || 724 if (screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_VIEWS ||
725 screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_WEBUI) { 725 screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_WEBUI) {
726 manager->RemovePreLoginPreferenceObserver(this); 726 manager->RemovePreLoginPreferenceObserver(this);
727 } else if (screen_mode_ == StatusAreaViewChromeos::BROWSER_MODE) { 727 } else if (screen_mode_ == StatusAreaViewChromeos::BROWSER_MODE) {
728 manager->RemovePostLoginPreferenceObserver(this); 728 manager->RemovePostLoginPreferenceObserver(this);
729 } 729 }
730 manager->RemoveObserver(this); 730 manager->RemoveObserver(this);
731 } 731 }
732 732
733 } // namespace chromeos 733 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/clock_menu_button.cc ('k') | chrome/browser/chromeos/status/input_method_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698