chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc - Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/ash/status_area_host_aura_browsertest.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

« no previous file with comments | « chrome/browser/ui/views/ash/status_area_host_aura.cc ('k') | chrome/browser/ui/views/ash/volume_controller_chromeos.h » ('j') | no next file with comments »

OLD	NEW
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 "ash/shell.h"	5 #include "ash/shell.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "chrome/browser/chromeos/status/status_area_button.h"	8 #include "chrome/browser/chromeos/status/status_area_button.h"

9 #include "chrome/browser/profiles/profile_manager.h"	9 #include "chrome/browser/profiles/profile_manager.h"

10 #include "chrome/browser/chromeos/system/runtime_environment.h"	10 #include "chrome/browser/chromeos/system/runtime_environment.h"

11 #include "chrome/browser/ui/browser.h"	11 #include "chrome/browser/ui/browser.h"

12 #include "chrome/browser/ui/browser_window.h"	12 #include "chrome/browser/ui/browser_window.h"

13 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"	13 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"

14 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"	14 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"

15 #include "chrome/common/chrome_notification_types.h"	15 #include "chrome/common/chrome_notification_types.h"

16 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

17 #include "chrome/test/base/in_process_browser_test.h"	17 #include "chrome/test/base/in_process_browser_test.h"

18 #include "chrome/test/base/ui_test_utils.h"	18 #include "chrome/test/base/ui_test_utils.h"

19 #include "content/public/browser/notification_service.h"	19 #include "content/public/browser/notification_service.h"

20 #include "ui/gfx/size.h"	20 #include "ui/gfx/size.h"

21	21

22 #if defined(OS_CHROMEOS)	22 #if defined(OS_CHROMEOS)

23 #include "chrome/browser/chromeos/login/screen_locker.h"	23 #include "chrome/browser/chromeos/login/screen_locker.h"

24 #include "chrome/browser/chromeos/login/screen_locker_tester.h"	24 #include "chrome/browser/chromeos/login/screen_locker_tester.h"

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 } else {	102 } else {

103 EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,	103 EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,

104 host->GetStatusAreaTextStyle());	104 host->GetStatusAreaTextStyle());

105 }	105 }

106 EXPECT_EQ(StatusAreaHostAura::GetCompactModeBrowserOffset().ToString(),	106 EXPECT_EQ(StatusAreaHostAura::GetCompactModeBrowserOffset().ToString(),

107 ash::Shell::GetInstance()->compact_status_area_offset().ToString());	107 ash::Shell::GetInstance()->compact_status_area_offset().ToString());

108 #endif	108 #endif

109	109

110 browser->CloseWindow();	110 browser->CloseWindow();

111 }	111 }

OLD	NEW