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

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

Issue 14890005: Enable Clang warnings in .cc files for Linux+[Aura/ChromeOS] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 input_method::InputMethodManager* manager, bool show_message) OVERRIDE { 1395 input_method::InputMethodManager* manager, bool show_message) OVERRIDE {
1396 GetSystemTrayNotifier()->NotifyRefreshIME(show_message); 1396 GetSystemTrayNotifier()->NotifyRefreshIME(show_message);
1397 } 1397 }
1398 1398
1399 virtual void InputMethodPropertyChanged( 1399 virtual void InputMethodPropertyChanged(
1400 input_method::InputMethodManager* manager) OVERRIDE { 1400 input_method::InputMethodManager* manager) OVERRIDE {
1401 GetSystemTrayNotifier()->NotifyRefreshIME(false); 1401 GetSystemTrayNotifier()->NotifyRefreshIME(false);
1402 } 1402 }
1403 1403
1404 // drive::JobListObserver overrides. 1404 // drive::JobListObserver overrides.
1405 virtual void OnJobAdded(const drive::JobInfo& job_info) { 1405 virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE {
1406 OnJobUpdated(job_info); 1406 OnJobUpdated(job_info);
1407 } 1407 }
1408 1408
1409 virtual void OnJobDone(const drive::JobInfo& job_info, 1409 virtual void OnJobDone(const drive::JobInfo& job_info,
1410 drive::FileError error) { 1410 drive::FileError error) OVERRIDE {
1411 ash::DriveOperationStatus status; 1411 ash::DriveOperationStatus status;
1412 if (ConvertToFinishedDriveOperationStatus(job_info, error, &status)) 1412 if (ConvertToFinishedDriveOperationStatus(job_info, error, &status))
1413 GetSystemTrayNotifier()->NotifyDriveJobUpdated(status); 1413 GetSystemTrayNotifier()->NotifyDriveJobUpdated(status);
1414 } 1414 }
1415 1415
1416 virtual void OnJobUpdated(const drive::JobInfo& job_info) { 1416 virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE {
1417 ash::DriveOperationStatus status; 1417 ash::DriveOperationStatus status;
1418 if (ConvertToDriveOperationStatus(job_info, &status)) 1418 if (ConvertToDriveOperationStatus(job_info, &status))
1419 GetSystemTrayNotifier()->NotifyDriveJobUpdated(status); 1419 GetSystemTrayNotifier()->NotifyDriveJobUpdated(status);
1420 } 1420 }
1421 1421
1422 DriveSystemService* FindDriveSystemService() { 1422 DriveSystemService* FindDriveSystemService() {
1423 Profile* profile = ProfileManager::GetDefaultProfile(); 1423 Profile* profile = ProfileManager::GetDefaultProfile();
1424 return DriveSystemServiceFactory::FindForProfile(profile); 1424 return DriveSystemServiceFactory::FindForProfile(profile);
1425 } 1425 }
1426 1426
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1618 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1619 }; 1619 };
1620 1620
1621 } // namespace 1621 } // namespace
1622 1622
1623 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1623 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1624 return new chromeos::SystemTrayDelegate(); 1624 return new chromeos::SystemTrayDelegate();
1625 } 1625 }
1626 1626
1627 } // namespace chromeos 1627 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698