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

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

Issue 659883002: Enable hidpi on Linux, refactor a bit on Windows to share Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: constants Created 6 years, 2 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" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/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/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/signin/signin_header_helper.h" 13 #include "chrome/browser/signin/signin_header_helper.h"
14 #include "chrome/browser/themes/theme_properties.h" 14 #include "chrome/browser/themes/theme_properties.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 15 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" 16 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
17 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" 17 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
18 #include "chrome/browser/ui/views/tabs/tab.h" 18 #include "chrome/browser/ui/views/tabs/tab.h"
19 #include "chrome/browser/ui/views/tabs/tab_strip.h" 19 #include "chrome/browser/ui/views/tabs/tab_strip.h"
20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
21 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "components/signin/core/common/profile_management_switches.h" 22 #include "components/signin/core/common/profile_management_switches.h"
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.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/dpi.h"
28 #include "ui/gfx/icon_util.h" 29 #include "ui/gfx/icon_util.h"
29 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
30 #include "ui/gfx/win/dpi.h"
31 #include "ui/resources/grit/ui_resources.h" 31 #include "ui/resources/grit/ui_resources.h"
32 #include "ui/views/controls/label.h" 32 #include "ui/views/controls/label.h"
33 #include "ui/views/layout/layout_constants.h" 33 #include "ui/views/layout/layout_constants.h"
34 #include "ui/views/win/hwnd_util.h" 34 #include "ui/views/win/hwnd_util.h"
35 #include "ui/views/window/client_view.h" 35 #include "ui/views/window/client_view.h"
36 36
37 HICON GlassBrowserFrameView::throbber_icons_[ 37 HICON GlassBrowserFrameView::throbber_icons_[
38 GlassBrowserFrameView::kThrobberIconCount]; 38 GlassBrowserFrameView::kThrobberIconCount];
39 39
40 namespace { 40 namespace {
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 static bool initialized = false; 595 static bool initialized = false;
596 if (!initialized) { 596 if (!initialized) {
597 for (int i = 0; i < kThrobberIconCount; ++i) { 597 for (int i = 0; i < kThrobberIconCount; ++i) {
598 throbber_icons_[i] = 598 throbber_icons_[i] =
599 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 599 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
600 DCHECK(throbber_icons_[i]); 600 DCHECK(throbber_icons_[i]);
601 } 601 }
602 initialized = true; 602 initialized = true;
603 } 603 }
604 } 604 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698