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

Side by Side Diff: ash/shell.cc

Issue 9835045: Support IME properties in uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | ash/system/ime/tray_ime.cc » ('j') | ash/system/ime/tray_ime.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/app_list/app_list.h" 9 #include "ash/app_list/app_list.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 350
351 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE { 351 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE {
352 } 352 }
353 353
354 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE { 354 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE {
355 } 355 }
356 356
357 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { 357 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE {
358 } 358 }
359 359
360 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE {
361 }
362
360 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { 363 virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
361 } 364 }
362 365
366 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
367 }
368
363 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, 369 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,
364 bool large) OVERRIDE { 370 bool large) OVERRIDE {
365 } 371 }
366 372
367 virtual void GetAvailableNetworks( 373 virtual void GetAvailableNetworks(
368 std::vector<NetworkIconInfo>* list) OVERRIDE { 374 std::vector<NetworkIconInfo>* list) OVERRIDE {
369 } 375 }
370 376
371 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { 377 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
372 } 378 }
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 desktop_background_controller_->SetDesktopBackgroundImageMode( 846 desktop_background_controller_->SetDesktopBackgroundImageMode(
841 GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex())); 847 GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex()));
842 } 848 }
843 849
844 void Shell::DisableWorkspaceGridLayout() { 850 void Shell::DisableWorkspaceGridLayout() {
845 if (workspace_controller_.get()) 851 if (workspace_controller_.get())
846 workspace_controller_->workspace_manager()->set_grid_size(0); 852 workspace_controller_->workspace_manager()->set_grid_size(0);
847 } 853 }
848 854
849 } // namespace ash 855 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/ime/tray_ime.cc » ('j') | ash/system/ime/tray_ime.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698