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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_win.cc

Issue 210903003: Implemented system tray UI for new account management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflicts resolved. Created 6 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 | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/chrome_browser_ui.gypi » ('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 "chrome/browser/ui/ash/system_tray_delegate_win.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 virtual bool IsNetworkBehindCaptivePortal( 288 virtual bool IsNetworkBehindCaptivePortal(
289 const std::string& service_path) const OVERRIDE { 289 const std::string& service_path) const OVERRIDE {
290 return false; 290 return false;
291 } 291 }
292 292
293 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE { 293 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE {
294 return false; 294 return false;
295 } 295 }
296 296
297 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
298 const std::string& user_id) OVERRIDE {
299 return NULL;
300 }
301
297 private: 302 private:
298 ash::SystemTrayNotifier* GetSystemTrayNotifier() { 303 ash::SystemTrayNotifier* GetSystemTrayNotifier() {
299 return ash::Shell::GetInstance()->system_tray_notifier(); 304 return ash::Shell::GetInstance()->system_tray_notifier();
300 } 305 }
301 306
302 void UpdateClockType() { 307 void UpdateClockType() {
303 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ? 308 clock_type_ = (base::GetHourClockType() == base::k24HourClock) ?
304 base::k24HourClock : base::k12HourClock; 309 base::k24HourClock : base::k12HourClock;
305 GetSystemTrayNotifier()->NotifyDateFormatChanged(); 310 GetSystemTrayNotifier()->NotifyDateFormatChanged();
306 } 311 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 344
340 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); 345 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin);
341 }; 346 };
342 347
343 } // namespace 348 } // namespace
344 349
345 350
346 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { 351 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() {
347 return new SystemTrayDelegateWin(); 352 return new SystemTrayDelegateWin();
348 } 353 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698