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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 (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/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 8 #include "base/win/windows_version.h"
10 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_dll_resource.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/themes/theme_properties.h" 12 #include "chrome/browser/themes/theme_properties.h"
14 #include "chrome/browser/ui/layout_constants.h" 13 #include "chrome/browser/ui/layout_constants.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 14 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" 15 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
17 #include "chrome/browser/ui/views/tabs/tab.h" 16 #include "chrome/browser/ui/views/tabs/tab.h"
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" 17 #include "chrome/browser/ui/views/tabs/tab_strip.h"
19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 18 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
19 #include "components/prefs/pref_service.h"
20 #include "components/signin/core/browser/signin_header_helper.h" 20 #include "components/signin/core/browser/signin_header_helper.h"
21 #include "components/signin/core/common/profile_management_switches.h" 21 #include "components/signin/core/common/profile_management_switches.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 #include "skia/ext/image_operations.h" 23 #include "skia/ext/image_operations.h"
24 #include "ui/base/material_design/material_design_controller.h" 24 #include "ui/base/material_design/material_design_controller.h"
25 #include "ui/base/resource/resource_bundle_win.h" 25 #include "ui/base/resource/resource_bundle_win.h"
26 #include "ui/base/theme_provider.h" 26 #include "ui/base/theme_provider.h"
27 #include "ui/gfx/canvas.h" 27 #include "ui/gfx/canvas.h"
28 #include "ui/gfx/icon_util.h" 28 #include "ui/gfx/icon_util.h"
29 #include "ui/gfx/image/image.h" 29 #include "ui/gfx/image/image.h"
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 static bool initialized = false; 681 static bool initialized = false;
682 if (!initialized) { 682 if (!initialized) {
683 for (int i = 0; i < kThrobberIconCount; ++i) { 683 for (int i = 0; i < kThrobberIconCount; ++i) {
684 throbber_icons_[i] = 684 throbber_icons_[i] =
685 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 685 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
686 DCHECK(throbber_icons_[i]); 686 DCHECK(throbber_icons_[i]);
687 } 687 }
688 initialized = true; 688 initialized = true;
689 } 689 }
690 } 690 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h ('k') | chrome/browser/ui/views/frame/global_menu_bar_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698