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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 14070014: Remove |third_party| from InputMethodDescriptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "chrome/browser/upgrade_detector.h" 83 #include "chrome/browser/upgrade_detector.h"
84 #include "chrome/common/chrome_notification_types.h" 84 #include "chrome/common/chrome_notification_types.h"
85 #include "chrome/common/pref_names.h" 85 #include "chrome/common/pref_names.h"
86 #include "chrome/common/time_format.h" 86 #include "chrome/common/time_format.h"
87 #include "chrome/common/url_constants.h" 87 #include "chrome/common/url_constants.h"
88 #include "chromeos/chromeos_switches.h" 88 #include "chromeos/chromeos_switches.h"
89 #include "chromeos/dbus/dbus_thread_manager.h" 89 #include "chromeos/dbus/dbus_thread_manager.h"
90 #include "chromeos/dbus/power_manager_client.h" 90 #include "chromeos/dbus/power_manager_client.h"
91 #include "chromeos/dbus/session_manager_client.h" 91 #include "chromeos/dbus/session_manager_client.h"
92 #include "chromeos/dbus/system_clock_client.h" 92 #include "chromeos/dbus/system_clock_client.h"
93 #include "chromeos/ime/extension_ime_util.h"
93 #include "chromeos/ime/xkeyboard.h" 94 #include "chromeos/ime/xkeyboard.h"
94 #include "content/public/browser/browser_thread.h" 95 #include "content/public/browser/browser_thread.h"
95 #include "content/public/browser/notification_observer.h" 96 #include "content/public/browser/notification_observer.h"
96 #include "content/public/browser/notification_service.h" 97 #include "content/public/browser/notification_service.h"
97 #include "content/public/browser/user_metrics.h" 98 #include "content/public/browser/user_metrics.h"
98 #include "device/bluetooth/bluetooth_adapter.h" 99 #include "device/bluetooth/bluetooth_adapter.h"
99 #include "device/bluetooth/bluetooth_adapter_factory.h" 100 #include "device/bluetooth/bluetooth_adapter_factory.h"
100 #include "device/bluetooth/bluetooth_device.h" 101 #include "device/bluetooth/bluetooth_device.h"
101 #include "grit/ash_strings.h" 102 #include "grit/ash_strings.h"
102 #include "grit/generated_resources.h" 103 #include "grit/generated_resources.h"
(...skipping 30 matching lines...) Expand all
133 return info; 134 return info;
134 } 135 }
135 136
136 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, 137 void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
137 const input_method::InputMethodUtil& util, 138 const input_method::InputMethodUtil& util,
138 ash::IMEInfo* info) { 139 ash::IMEInfo* info) {
139 info->id = ime.id(); 140 info->id = ime.id();
140 info->name = util.GetInputMethodLongName(ime); 141 info->name = util.GetInputMethodLongName(ime);
141 info->medium_name = util.GetInputMethodMediumName(ime); 142 info->medium_name = util.GetInputMethodMediumName(ime);
142 info->short_name = util.GetInputMethodShortName(ime); 143 info->short_name = util.GetInputMethodShortName(ime);
143 info->third_party = ime.third_party(); 144 info->third_party = extension_ime_util::IsExtensionIME(ime.id());
144 } 145 }
145 146
146 gfx::NativeWindow GetNativeWindowByStatus( 147 gfx::NativeWindow GetNativeWindowByStatus(
147 ash::user::LoginStatus login_status) { 148 ash::user::LoginStatus login_status) {
148 int container_id = 149 int container_id =
149 (login_status == ash::user::LOGGED_IN_NONE || 150 (login_status == ash::user::LOGGED_IN_NONE ||
150 login_status == ash::user::LOGGED_IN_LOCKED) ? 151 login_status == ash::user::LOGGED_IN_LOCKED) ?
151 ash::internal::kShellWindowId_LockSystemModalContainer : 152 ash::internal::kShellWindowId_LockSystemModalContainer :
152 ash::internal::kShellWindowId_SystemModalContainer; 153 ash::internal::kShellWindowId_SystemModalContainer;
153 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 154 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1583 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1584 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1584 }; 1585 };
1585 1586
1586 } // namespace 1587 } // namespace
1587 1588
1588 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1589 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1589 return new chromeos::SystemTrayDelegate(); 1590 return new chromeos::SystemTrayDelegate();
1590 } 1591 }
1591 1592
1592 } // namespace chromeos 1593 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698