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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 info->name = util.GetInputMethodLongName(ime); 140 info->name = util.GetInputMethodLongName(ime);
141 info->medium_name = util.GetInputMethodMediumName(ime); 141 info->medium_name = util.GetInputMethodMediumName(ime);
142 info->short_name = util.GetInputMethodShortName(ime); 142 info->short_name = util.GetInputMethodShortName(ime);
143 info->third_party = extension_ime_util::IsExtensionIME(ime.id()); 143 info->third_party = extension_ime_util::IsExtensionIME(ime.id());
144 } 144 }
145 145
146 gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status, 146 gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status,
147 bool session_started) { 147 bool session_started) {
148 int container_id = 148 int container_id =
149 (!session_started || login_status == ash::user::LOGGED_IN_NONE || 149 (!session_started || login_status == ash::user::LOGGED_IN_NONE ||
150 login_status == ash::user::LOGGED_IN_LOCKED) ? 150 login_status == ash::user::LOGGED_IN_LOCKED)
151 ash::internal::kShellWindowId_LockSystemModalContainer : 151 ? ash::kShellWindowId_LockSystemModalContainer
152 ash::internal::kShellWindowId_SystemModalContainer; 152 : ash::kShellWindowId_SystemModalContainer;
153 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 153 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
154 container_id); 154 container_id);
155 } 155 }
156 156
157 // Converts drive::JobInfo to ash::DriveOperationStatus. 157 // Converts drive::JobInfo to ash::DriveOperationStatus.
158 // If the job is not of type that ash tray is interested, returns false. 158 // If the job is not of type that ash tray is interested, returns false.
159 bool ConvertToDriveOperationStatus(const drive::JobInfo& info, 159 bool ConvertToDriveOperationStatus(const drive::JobInfo& info,
160 ash::DriveOperationStatus* status) { 160 ash::DriveOperationStatus* status) {
161 if (info.job_type == drive::TYPE_DOWNLOAD_FILE) { 161 if (info.job_type == drive::TYPE_DOWNLOAD_FILE) {
162 status->type = ash::DriveOperationStatus::OPERATION_DOWNLOAD; 162 status->type = ash::DriveOperationStatus::OPERATION_DOWNLOAD;
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1398 accessibility_subscription_.reset(); 1398 accessibility_subscription_.reset();
1399 else 1399 else
1400 OnAccessibilityModeChanged(details.notify); 1400 OnAccessibilityModeChanged(details.notify);
1401 } 1401 }
1402 1402
1403 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1403 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1404 return new SystemTrayDelegateChromeOS(); 1404 return new SystemTrayDelegateChromeOS();
1405 } 1405 }
1406 1406
1407 } // namespace chromeos 1407 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/shelf_browsertest.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698