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

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

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/ash/browser_non_client_frame_view_ash.h" 5 #include "chrome/browser/ui/views/ash/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_service.h" 9 #include "chrome/browser/themes/theme_service.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/search/search.h" 11 #include "chrome/browser/ui/search/search.h"
12 #include "chrome/browser/ui/search/search_delegate.h" 12 #include "chrome/browser/ui/search/search_delegate.h"
13 #include "chrome/browser/ui/search/search_model.h" 13 #include "chrome/browser/ui/search/search_model.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/tab_icon_view.h" 17 #include "chrome/browser/ui/views/tab_icon_view.h"
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" 18 #include "chrome/browser/ui/views/tabs/tab_strip.h"
19 #include "chrome/browser/ui/views/toolbar_view.h" 19 #include "chrome/browser/ui/views/toolbar_view.h"
20 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
21 #include "grit/ash_resources.h"
21 #include "grit/generated_resources.h" // Accessibility names 22 #include "grit/generated_resources.h" // Accessibility names
22 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
23 #include "grit/ui_resources.h"
24 #include "ui/aura/client/aura_constants.h" 24 #include "ui/aura/client/aura_constants.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/base/accessibility/accessible_view_state.h" 26 #include "ui/base/accessibility/accessible_view_state.h"
27 #include "ui/base/hit_test.h" 27 #include "ui/base/hit_test.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/layout.h" 29 #include "ui/base/layout.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/base/theme_provider.h" 31 #include "ui/base/theme_provider.h"
32 #include "ui/compositor/layer_animator.h" 32 #include "ui/compositor/layer_animator.h"
33 #include "ui/gfx/canvas.h" 33 #include "ui/gfx/canvas.h"
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const { 603 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
604 ui::ThemeProvider* tp = GetThemeProvider(); 604 ui::ThemeProvider* tp = GetThemeProvider();
605 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && 605 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
606 browser_view()->IsBrowserTypeNormal() && 606 browser_view()->IsBrowserTypeNormal() &&
607 !browser_view()->IsOffTheRecord()) { 607 !browser_view()->IsOffTheRecord()) {
608 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ? 608 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
609 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE); 609 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
610 } 610 }
611 return NULL; 611 return NULL;
612 } 612 }
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698