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

Side by Side Diff: chrome/browser/ui/views/ash/status_area_host_aura.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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/ui/views/aura/status_area_host_aura.h" 5 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/chromeos/status/clock_menu_button.h" 10 #include "chrome/browser/chromeos/status/clock_menu_button.h"
11 #include "chrome/browser/chromeos/status/memory_menu_button.h" 11 #include "chrome/browser/chromeos/status/memory_menu_button.h"
12 #include "chrome/browser/chromeos/status/status_area_view.h" 12 #include "chrome/browser/chromeos/status/status_area_view.h"
13 #include "chrome/browser/defaults.h" 13 #include "chrome/browser/defaults.h"
14 #include "chrome/browser/prefs/incognito_mode_prefs.h" 14 #include "chrome/browser/prefs/incognito_mode_prefs.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/themes/theme_service.h" 16 #include "chrome/browser/themes/theme_service.h"
17 #include "chrome/browser/themes/theme_service_factory.h" 17 #include "chrome/browser/themes/theme_service_factory.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/view_ids.h" 19 #include "chrome/browser/ui/view_ids.h"
20 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 20 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
21 #include "chrome/browser/ui/views/aura/multiple_window_indicator_button.h" 21 #include "chrome/browser/ui/views/ash/multiple_window_indicator_button.h"
22 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/views/widget/widget.h" 26 #include "ui/views/widget/widget.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "chrome/browser/chromeos/login/base_login_display_host.h" 29 #include "chrome/browser/chromeos/login/base_login_display_host.h"
30 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 30 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
31 #include "chrome/browser/chromeos/login/screen_locker.h" 31 #include "chrome/browser/chromeos/login/screen_locker.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 278 }
279 279
280 void StatusAreaHostAura::UpdateAppearance() { 280 void StatusAreaHostAura::UpdateAppearance() {
281 status_area_view_->UpdateButtonTextStyle(); 281 status_area_view_->UpdateButtonTextStyle();
282 282
283 gfx::Size offset = IsLoginOrLockScreenDisplayed() ? 283 gfx::Size offset = IsLoginOrLockScreenDisplayed() ?
284 GetCompactModeLoginAndLockOffset() : 284 GetCompactModeLoginAndLockOffset() :
285 GetCompactModeBrowserOffset(); 285 GetCompactModeBrowserOffset();
286 ash::Shell::GetInstance()->SetCompactStatusAreaOffset(offset); 286 ash::Shell::GetInstance()->SetCompactStatusAreaOffset(offset);
287 } 287 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/status_area_host_aura.h ('k') | chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698