chrome/browser/chromeos/frame/normal_browser_frame_view.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

Side by Side Diff: chrome/browser/chromeos/frame/normal_browser_frame_view.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/chromeos/login/account_creation_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/chromeos/frame/normal_browser_frame_view.h"	5 #include "chrome/browser/chromeos/frame/normal_browser_frame_view.h"

6	6

7 #include "app/gfx/canvas.h"

8 #include "app/gfx/font.h"

9 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

10 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

11 #include "app/theme_provider.h"	9 #include "app/theme_provider.h"

12 #include "app/x11_util.h"	10 #include "app/x11_util.h"

13 #include "base/command_line.h"	11 #include "base/command_line.h"

14 #include "base/compiler_specific.h"	12 #include "base/compiler_specific.h"

15 #include "chrome/browser/browser_theme_provider.h"	13 #include "chrome/browser/browser_theme_provider.h"

16 #include "chrome/browser/tab_contents/tab_contents.h"	14 #include "chrome/browser/tab_contents/tab_contents.h"

17 #include "chrome/browser/views/frame/browser_extender.h"	15 #include "chrome/browser/views/frame/browser_extender.h"

18 #include "chrome/browser/views/frame/browser_frame.h"	16 #include "chrome/browser/views/frame/browser_frame.h"

19 #include "chrome/browser/views/frame/browser_view.h"	17 #include "chrome/browser/views/frame/browser_view.h"

20 #include "chrome/browser/views/tabs/tab_strip.h"	18 #include "chrome/browser/views/tabs/tab_strip.h"

21 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

	20 #include "gfx/canvas.h"

	21 #include "gfx/font.h"

22 #include "gfx/path.h"	22 #include "gfx/path.h"

23 #include "grit/app_resources.h"	23 #include "grit/app_resources.h"

24 #include "grit/chromium_strings.h"	24 #include "grit/chromium_strings.h"

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

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

27 #include "views/controls/button/image_button.h"	27 #include "views/controls/button/image_button.h"

28 #include "views/controls/image_view.h"	28 #include "views/controls/image_view.h"

29 #include "views/window/hit_test.h"	29 #include "views/window/hit_test.h"

30 #include "views/widget/root_view.h"	30 #include "views/widget/root_view.h"

31 #include "views/window/window.h"	31 #include "views/window/window.h"

(...skipping 336 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
368 bottom_edge_height, toolbar_bounds.right(), bottom_y,	368 bottom_edge_height, toolbar_bounds.right(), bottom_y,

369 toolbar_right->width(), bottom_edge_height, false);	369 toolbar_right->width(), bottom_edge_height, false);

370	370

371 // Draw the content/toolbar separator.	371 // Draw the content/toolbar separator.

372 canvas->DrawLineInt(ResourceBundle::toolbar_separator_color,	372 canvas->DrawLineInt(ResourceBundle::toolbar_separator_color,

373 toolbar_bounds.x(), toolbar_bounds.bottom() - 1,	373 toolbar_bounds.x(), toolbar_bounds.bottom() - 1,

374 toolbar_bounds.right() - 1, toolbar_bounds.bottom() - 1);	374 toolbar_bounds.right() - 1, toolbar_bounds.bottom() - 1);

375 }	375 }

376	376

377 } // namespace chromeos	377 } // namespace chromeos

OLD	NEW