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

Side by Side Diff: ash/shell.cc

Issue 10008043: Allow non-radio button properties in uber tray. Simplified chinese will use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 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
« no previous file with comments | « no previous file | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »
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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 370
371 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE { 371 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE {
372 } 372 }
373 373
374 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { 374 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE {
375 } 375 }
376 376
377 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { 377 virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
378 } 378 }
379 379
380 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { 380 virtual void ActivateIMEProperty(const std::string& key,
381 bool is_selection) OVERRIDE {
381 } 382 }
382 383
383 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, 384 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,
384 bool large) OVERRIDE { 385 bool large) OVERRIDE {
385 } 386 }
386 387
387 virtual void GetAvailableNetworks( 388 virtual void GetAvailableNetworks(
388 std::vector<NetworkIconInfo>* list) OVERRIDE { 389 std::vector<NetworkIconInfo>* list) OVERRIDE {
389 } 390 }
390 391
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 desktop_background_controller_->SetDesktopBackgroundImageMode( 935 desktop_background_controller_->SetDesktopBackgroundImageMode(
935 GetWallpaper(index), GetWallpaperInfo(index).layout); 936 GetWallpaper(index), GetWallpaperInfo(index).layout);
936 } 937 }
937 938
938 void Shell::DisableWorkspaceGridLayout() { 939 void Shell::DisableWorkspaceGridLayout() {
939 if (workspace_controller_.get()) 940 if (workspace_controller_.get())
940 workspace_controller_->workspace_manager()->set_grid_size(0); 941 workspace_controller_->workspace_manager()->set_grid_size(0);
941 } 942 }
942 943
943 } // namespace ash 944 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698