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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/tab_contents/tab_contents.h" 11 #include "chrome/browser/tab_contents/tab_contents.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/view_ids.h" 13 #include "chrome/browser/ui/view_ids.h"
14 #include "chrome/browser/ui/views/tabs/tab_controller.h" 14 #include "chrome/browser/ui/views/tabs/tab_controller.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "gfx/canvas_skia.h"
17 #include "gfx/favicon_size.h"
18 #include "gfx/font.h"
19 #include "grit/app_resources.h" 16 #include "grit/app_resources.h"
20 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
22 #include "ui/base/animation/slide_animation.h" 19 #include "ui/base/animation/slide_animation.h"
23 #include "ui/base/animation/throb_animation.h" 20 #include "ui/base/animation/throb_animation.h"
24 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/base/theme_provider.h" 23 #include "ui/base/theme_provider.h"
24 #include "ui/gfx/canvas_skia.h"
25 #include "ui/gfx/favicon_size.h"
26 #include "ui/gfx/font.h"
27 #include "views/controls/button/image_button.h" 27 #include "views/controls/button/image_button.h"
28 28
29 // How long the pulse throb takes. 29 // How long the pulse throb takes.
30 static const int kPulseDurationMs = 200; 30 static const int kPulseDurationMs = 200;
31 31
32 // How long the hover state takes. 32 // How long the hover state takes.
33 static const int kHoverDurationMs = 400; 33 static const int kHoverDurationMs = 400;
34 34
35 namespace { 35 namespace {
36 36
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 // static 468 // static
469 void BaseTab::InitResources() { 469 void BaseTab::InitResources() {
470 static bool initialized = false; 470 static bool initialized = false;
471 if (!initialized) { 471 if (!initialized) {
472 initialized = true; 472 initialized = true;
473 font_ = new gfx::Font( 473 font_ = new gfx::Font(
474 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); 474 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
475 font_height_ = font_->GetHeight(); 475 font_height_ = font_->GetHeight();
476 } 476 }
477 } 477 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tab_icon_view.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698