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

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

Issue 12754010: Move immersive_mode_controller into c/b/ui/views/frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
OLDNEW
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/wm/frame_painter.h" 7 #include "ash/wm/frame_painter.h"
8 #include "ash/wm/workspace/frame_maximize_button.h" 8 #include "ash/wm/workspace/frame_maximize_button.h"
9 #include "chrome/browser/themes/theme_properties.h" 9 #include "chrome/browser/themes/theme_properties.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/views/avatar_menu_button.h" 11 #include "chrome/browser/ui/views/avatar_menu_button.h"
12 #include "chrome/browser/ui/views/frame/browser_frame.h" 12 #include "chrome/browser/ui/views/frame/browser_frame.h"
13 #include "chrome/browser/ui/views/frame/browser_view.h" 13 #include "chrome/browser/ui/views/frame/browser_view.h"
14 #include "chrome/browser/ui/views/immersive_mode_controller.h" 14 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
15 #include "chrome/browser/ui/views/tab_icon_view.h" 15 #include "chrome/browser/ui/views/tab_icon_view.h"
16 #include "chrome/browser/ui/views/tabs/tab_strip.h" 16 #include "chrome/browser/ui/views/tabs/tab_strip.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "grit/ash_resources.h" 18 #include "grit/ash_resources.h"
19 #include "grit/generated_resources.h" // Accessibility names 19 #include "grit/generated_resources.h" // Accessibility names
20 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "ui/aura/client/aura_constants.h" 21 #include "ui/aura/client/aura_constants.h"
22 #include "ui/aura/window.h" 22 #include "ui/aura/window.h"
23 #include "ui/base/accessibility/accessible_view_state.h" 23 #include "ui/base/accessibility/accessible_view_state.h"
24 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const { 505 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
506 ui::ThemeProvider* tp = GetThemeProvider(); 506 ui::ThemeProvider* tp = GetThemeProvider();
507 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && 507 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
508 browser_view()->IsBrowserTypeNormal() && 508 browser_view()->IsBrowserTypeNormal() &&
509 !browser_view()->IsOffTheRecord()) { 509 !browser_view()->IsOffTheRecord()) {
510 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ? 510 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
511 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE); 511 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
512 } 512 }
513 return NULL; 513 return NULL;
514 } 514 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698