chrome/browser/ui/views/toolbar_view.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/toolbar_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/task_manager_view.cc ('k') | chrome/browser/ui/views/toolbar_view_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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/toolbar_view.h"	5 #include "chrome/browser/ui/views/toolbar_view.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/debug/trace_event.h"

8 #include "base/i18n/number_formatting.h"	8 #include "base/i18n/number_formatting.h"

9 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

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

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/command_updater.h"	12 #include "chrome/browser/command_updater.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/themes/theme_service.h"	14 #include "chrome/browser/themes/theme_service.h"

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

16 #include "chrome/browser/ui/browser_command_controller.h"	16 #include "chrome/browser/ui/browser_command_controller.h"

17 #include "chrome/browser/ui/browser_commands.h"	17 #include "chrome/browser/ui/browser_commands.h"

18 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"	18 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"

19 #include "chrome/browser/ui/browser_instant_controller.h"	19 #include "chrome/browser/ui/browser_instant_controller.h"

20 #include "chrome/browser/ui/browser_tabstrip.h"	20 #include "chrome/browser/ui/browser_tabstrip.h"

(...skipping 800 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
821	821

822 void ToolbarView::OnShowHomeButtonChanged() {	822 void ToolbarView::OnShowHomeButtonChanged() {

823 Layout();	823 Layout();

824 SchedulePaint();	824 SchedulePaint();

825 }	825 }

826	826

827 int ToolbarView::content_shadow_height() const {	827 int ToolbarView::content_shadow_height() const {

828 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?	828 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?

829 kContentShadowHeightAsh : kContentShadowHeight;	829 kContentShadowHeightAsh : kContentShadowHeight;

830 }	830 }

OLD	NEW