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

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

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 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
OLDNEW
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/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/tab_contents_wrapper.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
13 #include "chrome/browser/ui/title_prefix_matcher.h" 13 #include "chrome/browser/ui/title_prefix_matcher.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 "content/browser/tab_contents/tab_contents.h" 17 #include "content/browser/tab_contents/tab_contents.h"
18 #include "grit/app_resources.h" 18 #include "grit/app_resources.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "grit/theme_resources_standard.h"
21 #include "ui/base/accessibility/accessible_view_state.h" 22 #include "ui/base/accessibility/accessible_view_state.h"
22 #include "ui/base/animation/animation_container.h" 23 #include "ui/base/animation/animation_container.h"
23 #include "ui/base/animation/slide_animation.h" 24 #include "ui/base/animation/slide_animation.h"
24 #include "ui/base/animation/throb_animation.h" 25 #include "ui/base/animation/throb_animation.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/base/text/text_elider.h" 28 #include "ui/base/text/text_elider.h"
28 #include "ui/base/theme_provider.h" 29 #include "ui/base/theme_provider.h"
29 #include "ui/gfx/canvas_skia.h" 30 #include "ui/gfx/canvas_skia.h"
30 #include "ui/gfx/favicon_size.h" 31 #include "ui/gfx/favicon_size.h"
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 // static 589 // static
589 void BaseTab::InitResources() { 590 void BaseTab::InitResources() {
590 static bool initialized = false; 591 static bool initialized = false;
591 if (!initialized) { 592 if (!initialized) {
592 initialized = true; 593 initialized = true;
593 font_ = new gfx::Font( 594 font_ = new gfx::Font(
594 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); 595 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
595 font_height_ = font_->GetHeight(); 596 font_height_ = font_->GetHeight();
596 } 597 }
597 } 598 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/notifications/balloon_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