chrome/browser/ui/views/browser_actions_container.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff: chrome/browser/ui/views/browser_actions_container.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

« no previous file with comments | « chrome/browser/ui/views/browser_action_view.cc ('k') | chrome/browser/ui/views/chrome_to_mobile_bubble_view.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/browser_actions_container.h"	5 #include "chrome/browser/ui/views/browser_actions_container.h"

6	6

7 #include "base/stl_util.h"	7 #include "base/stl_util.h"

8 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

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

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

11 #include "chrome/browser/sessions/restore_tab_helper.h"	11 #include "chrome/browser/sessions/restore_tab_helper.h"

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

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

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

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

16 #include "chrome/browser/ui/views/browser_action_view.h"	16 #include "chrome/browser/ui/views/browser_action_view.h"

17 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"	17 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

18 #include "chrome/browser/ui/views/extensions/extension_popup.h"	18 #include "chrome/browser/ui/views/extensions/extension_popup.h"

19 #include "chrome/browser/ui/views/toolbar_view.h"	19 #include "chrome/browser/ui/views/toolbar_view.h"

20 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

21 #include "grit/generated_resources.h"	21 #include "grit/generated_resources.h"

22 #include "grit/theme_resources.h"	22 #include "grit/theme_resources.h"

23 #include "grit/theme_resources_standard.h"

24 #include "grit/ui_resources.h"	23 #include "grit/ui_resources.h"

25 #include "ui/base/accessibility/accessible_view_state.h"	24 #include "ui/base/accessibility/accessible_view_state.h"

26 #include "ui/base/animation/slide_animation.h"	25 #include "ui/base/animation/slide_animation.h"

27 #include "ui/base/dragdrop/drag_utils.h"	26 #include "ui/base/dragdrop/drag_utils.h"

28 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

29 #include "ui/base/resource/resource_bundle.h"	28 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/base/theme_provider.h"	29 #include "ui/base/theme_provider.h"

31 #include "ui/gfx/canvas.h"	30 #include "ui/gfx/canvas.h"

32 #include "ui/views/controls/resize_area.h"	31 #include "ui/views/controls/resize_area.h"

33 #include "ui/views/metrics.h"	32 #include "ui/views/metrics.h"

(...skipping 773 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
807 views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?	806 views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?

808 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;	807 views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;

809 popup_ = ExtensionPopup::ShowPopup(popup_url,	808 popup_ = ExtensionPopup::ShowPopup(popup_url,

810 browser_,	809 browser_,

811 reference_view,	810 reference_view,

812 arrow_location);	811 arrow_location);

813 popup_->GetWidget()->AddObserver(this);	812 popup_->GetWidget()->AddObserver(this);

814 popup_button_ = button;	813 popup_button_ = button;

815 popup_button_->SetButtonPushed();	814 popup_button_->SetButtonPushed();

816 }	815 }

OLD	NEW