chrome/browser/ui/views/sad_tab_view.cc - Issue 6598086: Update more includes that were pointing to the old locations.

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

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync Created 9 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

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

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/google/google_util.h"	8 #include "chrome/browser/google/google_util.h"

9 #include "chrome/browser/tab_contents/tab_contents.h"	9 #include "chrome/browser/tab_contents/tab_contents.h"

10 #include "chrome/browser/tab_contents/tab_contents_delegate.h"

11 #include "chrome/common/url_constants.h"	10 #include "chrome/common/url_constants.h"

	11 #include "content/browser/tab_contents/tab_contents_delegate.h"

12 #include "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

13 #include "grit/locale_settings.h"	13 #include "grit/locale_settings.h"

14 #include "grit/theme_resources.h"	14 #include "grit/theme_resources.h"

15 #include "third_party/skia/include/effects/SkGradientShader.h"	15 #include "third_party/skia/include/effects/SkGradientShader.h"

16 #include "ui/base/l10n/l10n_util.h"	16 #include "ui/base/l10n/l10n_util.h"

17 #include "ui/base/resource/resource_bundle.h"	17 #include "ui/base/resource/resource_bundle.h"

18 #include "ui/gfx/canvas.h"	18 #include "ui/gfx/canvas.h"

19 #include "ui/gfx/canvas_skia.h"	19 #include "ui/gfx/canvas_skia.h"

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

21 #include "ui/gfx/skia_util.h"	21 #include "ui/gfx/skia_util.h"

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164	164

165 title_ = UTF16ToWide(l10n_util::GetStringUTF16(	165 title_ = UTF16ToWide(l10n_util::GetStringUTF16(

166 kind == CRASHED ? IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));	166 kind == CRASHED ? IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));

167 title_width_ = title_font_->GetStringWidth(WideToUTF16Hack(title_));	167 title_width_ = title_font_->GetStringWidth(WideToUTF16Hack(title_));

168 message_ = UTF16ToWide(l10n_util::GetStringUTF16(	168 message_ = UTF16ToWide(l10n_util::GetStringUTF16(

169 kind == CRASHED ? IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));	169 kind == CRASHED ? IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));

170	170

171 initialized = true;	171 initialized = true;

172 }	172 }

173 }	173 }

OLD	NEW