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

Side by Side Diff: chrome/browser/views/location_bar_view.h

Issue 501136: Merge 34812 - Add the rightclick context menu for Browser actions and Page... (Closed) Base URL: svn://chrome-svn/chrome/branches/249/src/
Patch Set: Created 11 years 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "app/gfx/font.h" 12 #include "app/gfx/font.h"
13 #include "base/gfx/rect.h" 13 #include "base/gfx/rect.h"
14 #include "base/task.h" 14 #include "base/task.h"
15 #include "chrome/browser/autocomplete/autocomplete_edit.h" 15 #include "chrome/browser/autocomplete/autocomplete_edit.h"
16 #include "chrome/browser/extensions/image_loading_tracker.h" 16 #include "chrome/browser/extensions/image_loading_tracker.h"
17 #include "chrome/browser/location_bar.h" 17 #include "chrome/browser/location_bar.h"
18 #include "chrome/browser/tab_contents/tab_contents.h" 18 #include "chrome/browser/tab_contents/tab_contents.h"
19 #include "chrome/browser/toolbar_model.h" 19 #include "chrome/browser/toolbar_model.h"
20 #include "chrome/browser/views/browser_bubble.h" 20 #include "chrome/browser/views/browser_bubble.h"
21 #include "chrome/browser/views/extensions/extension_action_context_menu.h"
21 #include "chrome/browser/views/info_bubble.h" 22 #include "chrome/browser/views/info_bubble.h"
22 #include "chrome/common/notification_observer.h" 23 #include "chrome/common/notification_observer.h"
23 #include "chrome/common/notification_registrar.h" 24 #include "chrome/common/notification_registrar.h"
24 #include "views/controls/image_view.h" 25 #include "views/controls/image_view.h"
25 #include "views/controls/label.h" 26 #include "views/controls/label.h"
26 #include "views/controls/native/native_view_host.h" 27 #include "views/controls/native/native_view_host.h"
27 #include "views/painter.h" 28 #include "views/painter.h"
28 29
29 #if defined(OS_WIN) 30 #if defined(OS_WIN)
30 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" 31 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 Profile* profile_; 421 Profile* profile_;
421 422
422 // The PageAction that this view represents. The PageAction is not owned by 423 // The PageAction that this view represents. The PageAction is not owned by
423 // us, it resides in the extension of this particular profile. 424 // us, it resides in the extension of this particular profile.
424 ExtensionAction* page_action_; 425 ExtensionAction* page_action_;
425 426
426 // A cache of bitmaps the page actions might need to show, mapped by path. 427 // A cache of bitmaps the page actions might need to show, mapped by path.
427 typedef std::map<std::string, SkBitmap> PageActionMap; 428 typedef std::map<std::string, SkBitmap> PageActionMap;
428 PageActionMap page_action_icons_; 429 PageActionMap page_action_icons_;
429 430
431 // The context menu for this page action.
432 scoped_ptr<ExtensionActionContextMenu> context_menu_;
433
430 // The object that is waiting for the image loading to complete 434 // The object that is waiting for the image loading to complete
431 // asynchronously. 435 // asynchronously.
432 ImageLoadingTracker* tracker_; 436 ImageLoadingTracker* tracker_;
433 437
434 // The tab id we are currently showing the icon for. 438 // The tab id we are currently showing the icon for.
435 int current_tab_id_; 439 int current_tab_id_;
436 440
437 // The URL we are currently showing the icon for. 441 // The URL we are currently showing the icon for.
438 GURL current_url_; 442 GURL current_url_;
439 443
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 // The positioner that places the omnibox and info bubbles. 594 // The positioner that places the omnibox and info bubbles.
591 const BubblePositioner* bubble_positioner_; 595 const BubblePositioner* bubble_positioner_;
592 596
593 // Storage of string needed for accessibility. 597 // Storage of string needed for accessibility.
594 std::wstring accessible_name_; 598 std::wstring accessible_name_;
595 599
596 DISALLOW_COPY_AND_ASSIGN(LocationBarView); 600 DISALLOW_COPY_AND_ASSIGN(LocationBarView);
597 }; 601 };
598 602
599 #endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_ 603 #endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/extensions/extension_action_context_menu.cc ('k') | chrome/browser/views/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698