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

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

Issue 12843019: Suppress error notifications and detailed view during OOBE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TrayAccessibilityTest Created 7 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
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 52 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
53 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 53 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
54 #include "chrome/browser/chromeos/input_method/input_method_util.h" 54 #include "chrome/browser/chromeos/input_method/input_method_util.h"
55 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 55 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
57 #include "chrome/browser/chromeos/login/base_login_display_host.h" 57 #include "chrome/browser/chromeos/login/base_login_display_host.h"
58 #include "chrome/browser/chromeos/login/help_app_launcher.h" 58 #include "chrome/browser/chromeos/login/help_app_launcher.h"
59 #include "chrome/browser/chromeos/login/login_display_host.h" 59 #include "chrome/browser/chromeos/login/login_display_host.h"
60 #include "chrome/browser/chromeos/login/user.h" 60 #include "chrome/browser/chromeos/login/user.h"
61 #include "chrome/browser/chromeos/login/user_manager.h" 61 #include "chrome/browser/chromeos/login/user_manager.h"
62 #include "chrome/browser/chromeos/login/wizard_controller.h"
62 #include "chrome/browser/chromeos/mobile_config.h" 63 #include "chrome/browser/chromeos/mobile_config.h"
63 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 64 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
64 #include "chrome/browser/chromeos/status/data_promo_notification.h" 65 #include "chrome/browser/chromeos/status/data_promo_notification.h"
65 #include "chrome/browser/chromeos/status/network_menu.h" 66 #include "chrome/browser/chromeos/status/network_menu.h"
66 #include "chrome/browser/chromeos/status/network_menu_icon.h" 67 #include "chrome/browser/chromeos/status/network_menu_icon.h"
67 #include "chrome/browser/chromeos/system/timezone_settings.h" 68 #include "chrome/browser/chromeos/system/timezone_settings.h"
68 #include "chrome/browser/chromeos/system_key_event_listener.h" 69 #include "chrome/browser/chromeos/system_key_event_listener.h"
69 #include "chrome/browser/google/google_util.h" 70 #include "chrome/browser/google/google_util.h"
70 #include "chrome/browser/google_apis/drive_service_interface.h" 71 #include "chrome/browser/google_apis/drive_service_interface.h"
71 #include "chrome/browser/lifetime/application_lifetime.h" 72 #include "chrome/browser/lifetime/application_lifetime.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 return ash::user::LOGGED_IN_OWNER; 387 return ash::user::LOGGED_IN_OWNER;
387 if (manager->IsLoggedInAsGuest()) 388 if (manager->IsLoggedInAsGuest())
388 return ash::user::LOGGED_IN_GUEST; 389 return ash::user::LOGGED_IN_GUEST;
389 if (manager->IsLoggedInAsDemoUser()) 390 if (manager->IsLoggedInAsDemoUser())
390 return ash::user::LOGGED_IN_RETAIL_MODE; 391 return ash::user::LOGGED_IN_RETAIL_MODE;
391 if (manager->IsLoggedInAsPublicAccount()) 392 if (manager->IsLoggedInAsPublicAccount())
392 return ash::user::LOGGED_IN_PUBLIC; 393 return ash::user::LOGGED_IN_PUBLIC;
393 return ash::user::LOGGED_IN_USER; 394 return ash::user::LOGGED_IN_USER;
394 } 395 }
395 396
397 virtual bool IsOobeCompleted() const OVERRIDE {
398 return WizardController::IsOobeCompleted();
399 }
400
396 virtual void ChangeProfilePicture() OVERRIDE { 401 virtual void ChangeProfilePicture() OVERRIDE {
397 content::RecordAction( 402 content::RecordAction(
398 content::UserMetricsAction("OpenChangeProfilePictureDialog")); 403 content::UserMetricsAction("OpenChangeProfilePictureDialog"));
399 chrome::ShowSettingsSubPage(GetAppropriateBrowser(), 404 chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
400 chrome::kChangeProfilePictureSubPage); 405 chrome::kChangeProfilePictureSubPage);
401 } 406 }
402 407
403 virtual const std::string GetEnterpriseDomain() const OVERRIDE { 408 virtual const std::string GetEnterpriseDomain() const OVERRIDE {
404 return enterprise_domain_; 409 return enterprise_domain_;
405 } 410 }
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1520 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1525 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1521 }; 1526 };
1522 1527
1523 } // namespace 1528 } // namespace
1524 1529
1525 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1530 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1526 return new chromeos::SystemTrayDelegate(); 1531 return new chromeos::SystemTrayDelegate();
1527 } 1532 }
1528 1533
1529 } // namespace chromeos 1534 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/tray/test_system_tray_delegate.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698