Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: chrome/browser/ui/views/tabs/base_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/tab_icon_view.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/base_tab.h" 5 #include "chrome/browser/ui/views/tabs/base_tab.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 12 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
13 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
14 #include "chrome/browser/ui/view_ids.h" 14 #include "chrome/browser/ui/view_ids.h"
15 #include "chrome/browser/ui/views/tabs/tab_controller.h" 15 #include "chrome/browser/ui/views/tabs/tab_controller.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "grit/theme_resources_standard.h"
20 #include "grit/ui_resources.h" 19 #include "grit/ui_resources.h"
21 #include "grit/ui_resources_standard.h"
22 #include "ui/base/accessibility/accessible_view_state.h" 20 #include "ui/base/accessibility/accessible_view_state.h"
23 #include "ui/base/animation/animation_container.h" 21 #include "ui/base/animation/animation_container.h"
24 #include "ui/base/animation/slide_animation.h" 22 #include "ui/base/animation/slide_animation.h"
25 #include "ui/base/animation/throb_animation.h" 23 #include "ui/base/animation/throb_animation.h"
26 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/base/text/text_elider.h" 26 #include "ui/base/text/text_elider.h"
29 #include "ui/base/theme_provider.h" 27 #include "ui/base/theme_provider.h"
30 #include "ui/gfx/canvas.h" 28 #include "ui/gfx/canvas.h"
31 #include "ui/gfx/favicon_size.h" 29 #include "ui/gfx/favicon_size.h"
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 // static 630 // static
633 void BaseTab::InitResources() { 631 void BaseTab::InitResources() {
634 static bool initialized = false; 632 static bool initialized = false;
635 if (!initialized) { 633 if (!initialized) {
636 initialized = true; 634 initialized = true;
637 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 635 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
638 font_ = new gfx::Font(rb.GetFont(ui::ResourceBundle::BaseFont)); 636 font_ = new gfx::Font(rb.GetFont(ui::ResourceBundle::BaseFont));
639 font_height_ = font_->GetHeight(); 637 font_height_ = font_->GetHeight();
640 } 638 }
641 } 639 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_icon_view.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698