chrome/browser/ui/views/toolbar_view.cc - Issue 10534153: Use OmniboxViewViews on Win with --enable-views-textfield.

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

Issue 10534153: Use OmniboxViewViews on Win with --enable-views-textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ignore Patch Set 3; use static bool in UseOmniboxViews(). Created 8 years, 6 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

« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.cc ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | no next file with comments »

OLD	NEW
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/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/event_disposition.h"	10 #include "chrome/browser/event_disposition.h"

11 #include "chrome/browser/prefs/pref_service.h"	11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"	14 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"

15 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/global_error_service.h"	16 #include "chrome/browser/ui/global_error_service.h"

17 #include "chrome/browser/ui/global_error_service_factory.h"	17 #include "chrome/browser/ui/global_error_service_factory.h"

	18 #include "chrome/browser/ui/omnibox/omnibox_view.h"

18 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	19 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

19 #include "chrome/browser/ui/view_ids.h"	20 #include "chrome/browser/ui/view_ids.h"

20 #include "chrome/browser/ui/views/browser_actions_container.h"	21 #include "chrome/browser/ui/views/browser_actions_container.h"

21 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"	22 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

22 #include "chrome/browser/ui/views/wrench_menu.h"	23 #include "chrome/browser/ui/views/wrench_menu.h"

23 #include "chrome/browser/upgrade_detector.h"	24 #include "chrome/browser/upgrade_detector.h"

24 #include "chrome/common/chrome_notification_types.h"	25 #include "chrome/common/chrome_notification_types.h"

25 #include "chrome/common/pref_names.h"	26 #include "chrome/common/pref_names.h"

26 #include "content/public/browser/browser_accessibility_state.h"	27 #include "content/public/browser/browser_accessibility_state.h"

27 #include "content/public/browser/notification_service.h"	28 #include "content/public/browser/notification_service.h"

(...skipping 791 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
819 accname_app = l10n_util::GetStringFUTF16(	820 accname_app = l10n_util::GetStringFUTF16(

820 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);	821 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);

821 }	822 }

822 app_menu_->SetAccessibleName(accname_app);	823 app_menu_->SetAccessibleName(accname_app);

823	824

824 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));	825 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));

825 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));	826 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));

826 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));	827 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));

827 SchedulePaint();	828 SchedulePaint();

828 }	829 }

OLD	NEW