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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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/glass_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_dll_resource.h"
11 #include "chrome/browser/prefs/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/browser/ui/search/search.h" 13 #include "chrome/browser/ui/search/search.h"
14 #include "chrome/browser/ui/search/search_model.h" 14 #include "chrome/browser/ui/search/search_model.h"
15 #include "chrome/browser/ui/views/avatar_menu_button.h" 15 #include "chrome/browser/ui/views/avatar_menu_button.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/tabs/tab.h" 17 #include "chrome/browser/ui/views/tabs/tab.h"
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" 18 #include "chrome/browser/ui/views/tabs/tab_strip.h"
19 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
24 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.h"
25 #include "grit/theme_resources_standard.h"
26 #include "grit/ui_resources.h" 25 #include "grit/ui_resources.h"
27 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/resource/resource_bundle_win.h" 27 #include "ui/base/resource/resource_bundle_win.h"
29 #include "ui/base/theme_provider.h" 28 #include "ui/base/theme_provider.h"
30 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
31 #include "ui/gfx/icon_util.h" 30 #include "ui/gfx/icon_util.h"
32 #include "ui/gfx/image/image.h" 31 #include "ui/gfx/image/image.h"
33 #include "ui/views/window/client_view.h" 32 #include "ui/views/window/client_view.h"
34 33
35 HICON GlassBrowserFrameView::throbber_icons_[ 34 HICON GlassBrowserFrameView::throbber_icons_[
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 static bool initialized = false; 514 static bool initialized = false;
516 if (!initialized) { 515 if (!initialized) {
517 for (int i = 0; i < kThrobberIconCount; ++i) { 516 for (int i = 0; i < kThrobberIconCount; ++i) {
518 throbber_icons_[i] = 517 throbber_icons_[i] =
519 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 518 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
520 DCHECK(throbber_icons_[i]); 519 DCHECK(throbber_icons_[i]);
521 } 520 }
522 initialized = true; 521 initialized = true;
523 } 522 }
524 } 523 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698