chrome/browser/ui/views/tabs/tab.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff: chrome/browser/ui/views/tabs/tab.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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/tabs/base_tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.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 "chrome/browser/ui/views/tabs/tab.h"	5 #include "chrome/browser/ui/views/tabs/tab.h"

6	6

7 #include <limits>	7 #include <limits>

8	8

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

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

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

12 #include "chrome/browser/ui/tabs/tab_resources.h"	12 #include "chrome/browser/ui/tabs/tab_resources.h"

13 #include "chrome/browser/ui/views/tabs/tab_controller.h"	13 #include "chrome/browser/ui/views/tabs/tab_controller.h"

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

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

16 #include "grit/theme_resources_standard.h"

17 #include "grit/ui_resources.h"	16 #include "grit/ui_resources.h"

18 #include "third_party/skia/include/effects/SkGradientShader.h"	17 #include "third_party/skia/include/effects/SkGradientShader.h"

19 #include "ui/base/animation/multi_animation.h"	18 #include "ui/base/animation/multi_animation.h"

20 #include "ui/base/animation/throb_animation.h"	19 #include "ui/base/animation/throb_animation.h"

21 #include "ui/base/layout.h"	20 #include "ui/base/layout.h"

22 #include "ui/base/resource/resource_bundle.h"	21 #include "ui/base/resource/resource_bundle.h"

23 #include "ui/gfx/canvas.h"	22 #include "ui/gfx/canvas.h"

24 #include "ui/gfx/favicon_size.h"	23 #include "ui/gfx/favicon_size.h"

25 #include "ui/gfx/font.h"	24 #include "ui/gfx/font.h"

26 #include "ui/gfx/image/image_skia_operations.h"	25 #include "ui/gfx/image/image_skia_operations.h"

(...skipping 789 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
816 rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT_SEARCH);	815 rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT_SEARCH);

817 tab_active_search_.l_width = tab_active_search_.image_l->width();	816 tab_active_search_.l_width = tab_active_search_.image_l->width();

818 tab_active_search_.r_width = tab_active_search_.image_r->width();	817 tab_active_search_.r_width = tab_active_search_.image_r->width();

819	818

820 tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);	819 tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);

821 tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);	820 tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);

822 tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);	821 tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);

823 tab_inactive_.l_width = tab_inactive_.image_l->width();	822 tab_inactive_.l_width = tab_inactive_.image_l->width();

824 tab_inactive_.r_width = tab_inactive_.image_r->width();	823 tab_inactive_.r_width = tab_inactive_.image_r->width();

825 }	824 }

OLD	NEW