chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory.

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« chrome/browser/chromeos/login/DEPS ('K') | « chrome/browser/ui/views/toolbar/browser_actions_container.h ('k') | chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc » ('j') | chrome/browser/ui/views/toolbar/wrench_toolbar_button.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/toolbar/browser_actions_container.h"

6	6

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

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

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

11 #include "chrome/browser/extensions/extension_system.h"	11 #include "chrome/browser/extensions/extension_system.h"

12 #include "chrome/browser/extensions/extension_util.h"	12 #include "chrome/browser/extensions/extension_util.h"

13 #include "chrome/browser/extensions/tab_helper.h"	13 #include "chrome/browser/extensions/tab_helper.h"

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

15 #include "chrome/browser/sessions/session_tab_helper.h"	15 #include "chrome/browser/sessions/session_tab_helper.h"

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

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

18 #include "chrome/browser/ui/tabs/tab_strip_model.h"	18 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

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

22 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"	21 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"

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

24 #include "chrome/browser/ui/views/toolbar_view.h"	23 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"

	24 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"

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

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

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

28 #include "grit/ui_resources.h"	28 #include "grit/ui_resources.h"

29 #include "ui/base/accessibility/accessible_view_state.h"	29 #include "ui/base/accessibility/accessible_view_state.h"

30 #include "ui/base/dragdrop/drag_utils.h"	30 #include "ui/base/dragdrop/drag_utils.h"

31 #include "ui/base/l10n/l10n_util.h"	31 #include "ui/base/l10n/l10n_util.h"

32 #include "ui/base/resource/resource_bundle.h"	32 #include "ui/base/resource/resource_bundle.h"

33 #include "ui/base/theme_provider.h"	33 #include "ui/base/theme_provider.h"

34 #include "ui/gfx/animation/slide_animation.h"	34 #include "ui/gfx/animation/slide_animation.h"

(...skipping 832 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
867 arrow,	867 arrow,

868 show_action);	868 show_action);

869 popup_->GetWidget()->AddObserver(this);	869 popup_->GetWidget()->AddObserver(this);

870 popup_button_ = button;	870 popup_button_ = button;

871	871

872 // Only set button as pushed if it was triggered by a user click.	872 // Only set button as pushed if it was triggered by a user click.

873 if (should_grant)	873 if (should_grant)

874 popup_button_->SetButtonPushed();	874 popup_button_->SetButtonPushed();

875 return true;	875 return true;

876 }	876 }

OLD	NEW