OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h" |
8 #include "ash/wm/frame_painter.h" | 9 #include "ash/wm/frame_painter.h" |
9 #include "ash/wm/workspace/frame_caption_button_container_view.h" | |
10 #include "chrome/browser/themes/theme_properties.h" | 10 #include "chrome/browser/themes/theme_properties.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/immersive_fullscreen_configuration.h" | 12 #include "chrome/browser/ui/immersive_fullscreen_configuration.h" |
13 #include "chrome/browser/ui/views/avatar_label.h" | 13 #include "chrome/browser/ui/views/avatar_label.h" |
14 #include "chrome/browser/ui/views/avatar_menu_button.h" | 14 #include "chrome/browser/ui/views/avatar_menu_button.h" |
15 #include "chrome/browser/ui/views/frame/browser_frame.h" | 15 #include "chrome/browser/ui/views/frame/browser_frame.h" |
16 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
17 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 17 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
18 #include "chrome/browser/ui/views/tab_icon_view.h" | 18 #include "chrome/browser/ui/views/tab_icon_view.h" |
19 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 19 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const { | 552 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const { |
553 ui::ThemeProvider* tp = GetThemeProvider(); | 553 ui::ThemeProvider* tp = GetThemeProvider(); |
554 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && | 554 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && |
555 browser_view()->IsBrowserTypeNormal() && | 555 browser_view()->IsBrowserTypeNormal() && |
556 !browser_view()->IsOffTheRecord()) { | 556 !browser_view()->IsOffTheRecord()) { |
557 return ShouldPaintAsActive() ? | 557 return ShouldPaintAsActive() ? |
558 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE; | 558 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE; |
559 } | 559 } |
560 return 0; | 560 return 0; |
561 } | 561 } |
OLD | NEW |