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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.cc

Issue 8497067: views: Remove the old views/window/ directory and its stubbed files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/browser/ui/views/uninstall_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar_view.h"
6 6
7 #include "base/i18n/number_formatting.h" 7 #include "base/i18n/number_formatting.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/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 17 matching lines...) Expand all
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "grit/theme_resources.h" 29 #include "grit/theme_resources.h"
30 #include "grit/theme_resources_standard.h" 30 #include "grit/theme_resources_standard.h"
31 #include "ui/base/accessibility/accessible_view_state.h" 31 #include "ui/base/accessibility/accessible_view_state.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/base/theme_provider.h" 34 #include "ui/base/theme_provider.h"
35 #include "ui/gfx/canvas.h" 35 #include "ui/gfx/canvas.h"
36 #include "ui/gfx/canvas_skia.h" 36 #include "ui/gfx/canvas_skia.h"
37 #include "ui/gfx/skbitmap_operations.h" 37 #include "ui/gfx/skbitmap_operations.h"
38 #include "ui/views/window/non_client_view.h"
38 #include "views/controls/button/button_dropdown.h" 39 #include "views/controls/button/button_dropdown.h"
39 #include "views/controls/menu/menu_listener.h" 40 #include "views/controls/menu/menu_listener.h"
40 #include "views/focus/view_storage.h" 41 #include "views/focus/view_storage.h"
41 #include "views/widget/tooltip_manager.h" 42 #include "views/widget/tooltip_manager.h"
42 #include "views/window/non_client_view.h"
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "chrome/browser/enumerate_modules_model_win.h" 45 #include "chrome/browser/enumerate_modules_model_win.h"
46 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" 46 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
47 #if !defined(USE_AURA) 47 #if !defined(USE_AURA)
48 #include "chrome/browser/ui/views/app_menu_button_win.h" 48 #include "chrome/browser/ui/views/app_menu_button_win.h"
49 #endif 49 #endif
50 #endif 50 #endif
51 51
52 // static 52 // static
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 accname_app = l10n_util::GetStringFUTF16( 742 accname_app = l10n_util::GetStringFUTF16(
743 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app); 743 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
744 } 744 }
745 app_menu_->SetAccessibleName(accname_app); 745 app_menu_->SetAccessibleName(accname_app);
746 746
747 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); 747 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
748 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); 748 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
749 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); 749 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
750 SchedulePaint(); 750 SchedulePaint();
751 } 751 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/browser/ui/views/uninstall_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698