chrome/browser/ui/ash/shelf_browsertest.cc - Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

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/ash/shelf_browsertest.cc

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 12 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/ash/session_state_delegate_views.cc ('k') | chrome/browser/ui/auto_login_infobar_delegate.cc » ('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/root_window_controller.h"	5 #include "ash/root_window_controller.h"

6 #include "ash/shelf/shelf_layout_manager.h"	6 #include "ash/shelf/shelf_layout_manager.h"

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/wm/workspace_controller.h"	8 #include "ash/wm/workspace_controller.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

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

(...skipping 15 matching lines...) Expand all Loading...
26 const gfx::Rect new_bounds(	26 const gfx::Rect new_bounds(

27 old_bounds.x(),	27 old_bounds.x(),

28 old_bounds.y(),	28 old_bounds.y(),

29 old_bounds.width(),	29 old_bounds.width(),

30 shelf->GetIdealBounds().y() - old_bounds.y());	30 shelf->GetIdealBounds().y() - old_bounds.y());

31 browser()->window()->SetBounds(new_bounds);	31 browser()->window()->SetBounds(new_bounds);

32 EXPECT_FALSE(shelf->window_overlaps_shelf());	32 EXPECT_FALSE(shelf->window_overlaps_shelf());

33	33

34 // Show status, which will overlap the shelf by a pixel.	34 // Show status, which will overlap the shelf by a pixel.

35 browser()->window()->GetStatusBubble()->SetStatus(	35 browser()->window()->GetStatusBubble()->SetStatus(

36 UTF8ToUTF16("Dummy Status Text"));	36 base::UTF8ToUTF16("Dummy Status Text"));

37 shelf->UpdateVisibilityState();	37 shelf->UpdateVisibilityState();

38	38

39 // Ensure that status doesn't cause overlap.	39 // Ensure that status doesn't cause overlap.

40 EXPECT_FALSE(shelf->window_overlaps_shelf());	40 EXPECT_FALSE(shelf->window_overlaps_shelf());

41 }	41 }

OLD	NEW