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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

Issue 2061823002: mash: Move ash constants and layout constants files to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayimageitem
Patch Set: rebase Created 4 years, 6 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
OLDNEW
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/common/ash_layout_constants.h"
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 12 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
13 #include "ash/frame/default_header_painter.h" 13 #include "ash/frame/default_header_painter.h"
14 #include "ash/frame/frame_border_hit_test_controller.h" 14 #include "ash/frame/frame_border_hit_test_controller.h"
15 #include "ash/frame/header_painter_util.h" 15 #include "ash/frame/header_painter_util.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
19 #include "chrome/browser/profiles/profiles_state.h" 19 #include "chrome/browser/profiles/profiles_state.h"
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 // TODO(pkasting): The "2 *" part of this makes no sense to me. 583 // TODO(pkasting): The "2 *" part of this makes no sense to me.
584 canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w, 584 canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w,
585 img_y, img_w, img_h); 585 img_y, img_w, img_h);
586 586
587 // Toolbar/content separator. 587 // Toolbar/content separator.
588 toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness, 588 toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness,
589 kClientEdgeThickness, 0); 589 kClientEdgeThickness, 0);
590 canvas->FillRect(toolbar_bounds, separator_color); 590 canvas->FillRect(toolbar_bounds, separator_color);
591 } 591 }
592 } 592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698