OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/frame/browser_non_client_frame_view_ash.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/ash_layout_constants.h" | 9 #include "ash/ash_layout_constants.h" |
10 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 10 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
11 #include "ash/frame/default_header_painter.h" | 11 #include "ash/frame/default_header_painter.h" |
12 #include "ash/frame/frame_border_hit_test_controller.h" | 12 #include "ash/frame/frame_border_hit_test_controller.h" |
13 #include "ash/frame/header_painter_util.h" | 13 #include "ash/frame/header_painter_util.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "base/profiler/scoped_tracker.h" | |
16 #include "build/build_config.h" | 15 #include "build/build_config.h" |
17 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
18 #include "chrome/browser/extensions/extension_util.h" | 17 #include "chrome/browser/extensions/extension_util.h" |
19 #include "chrome/browser/profiles/profiles_state.h" | 18 #include "chrome/browser/profiles/profiles_state.h" |
20 #include "chrome/browser/themes/theme_properties.h" | 19 #include "chrome/browser/themes/theme_properties.h" |
21 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 21 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/layout_constants.h" | 22 #include "chrome/browser/ui/layout_constants.h" |
24 #include "chrome/browser/ui/views/frame/browser_frame.h" | 23 #include "chrome/browser/ui/views/frame/browser_frame.h" |
25 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" | 24 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 // TODO(pkasting): The "2 *" part of this makes no sense to me. | 564 // TODO(pkasting): The "2 *" part of this makes no sense to me. |
566 canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w, | 565 canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w, |
567 img_y, img_w, img_h); | 566 img_y, img_w, img_h); |
568 | 567 |
569 // Toolbar/content separator. | 568 // Toolbar/content separator. |
570 toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness, | 569 toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness, |
571 kClientEdgeThickness, 0); | 570 kClientEdgeThickness, 0); |
572 canvas->FillRect(toolbar_bounds, separator_color); | 571 canvas->FillRect(toolbar_bounds, separator_color); |
573 } | 572 } |
574 } | 573 } |
OLD | NEW |