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

Side by Side Diff: chrome/browser/ui/views/frame/system_menu_model_builder.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/views/frame/system_menu_model_builder.h" 5 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/host_desktop.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 12 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
14 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
16 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
17 #include "ui/base/accelerators/accelerator.h" 16 #include "ui/base/accelerators/accelerator.h"
18 #include "ui/base/models/simple_menu_model.h" 17 #include "ui/base/models/simple_menu_model.h"
18 #include "ui/gfx/host_desktop_type.h"
19 19
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 #include "ash/session/session_state_delegate.h" 21 #include "ash/session/session_state_delegate.h"
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 23 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
24 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 24 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
25 #include "chrome/browser/ui/browser_window.h" 25 #include "chrome/browser/ui/browser_window.h"
26 #include "components/user_manager/user_info.h" 26 #include "components/user_manager/user_info.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 #endif 28 #endif
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 const user_manager::UserInfo* user_info = delegate->GetUserInfo(user_index); 181 const user_manager::UserInfo* user_info = delegate->GetUserInfo(user_index);
182 model->AddItem( 182 model->AddItem(
183 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2 183 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2
184 : IDC_VISIT_DESKTOP_OF_LRU_USER_3, 184 : IDC_VISIT_DESKTOP_OF_LRU_USER_3,
185 l10n_util::GetStringFUTF16(IDS_VISIT_DESKTOP_OF_LRU_USER, 185 l10n_util::GetStringFUTF16(IDS_VISIT_DESKTOP_OF_LRU_USER,
186 user_info->GetDisplayName(), 186 user_info->GetDisplayName(),
187 base::ASCIIToUTF16(user_info->GetEmail()))); 187 base::ASCIIToUTF16(user_info->GetEmail())));
188 } 188 }
189 #endif 189 #endif
190 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory.h ('k') | chrome/browser/ui/views/frame/taskbar_decorator_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698