chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc - Issue 6251001: Move chrome/browser/gtk/ to chrome/browser/ui/gtk/...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc

Issue 6251001: Move chrome/browser/gtk/ to chrome/browser/ui/gtk/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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:

OLD	NEW
1 // Copyright (c) 2010 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/gtk/status_icons/status_icon_gtk.h"	5 #include "chrome/browser/gtk/status_icons/status_icon_gtk.h"

6	6

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

8 #include "base/logging.h"	8 #include "base/logging.h"

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

10 #include "chrome/browser/gtk/menu_gtk.h"	10 #include "chrome/browser/gtk/menu_gtk.h"

11 #include "gfx/gtk_util.h"	11 #include "gfx/gtk_util.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 menu_.reset();	52 menu_.reset();

53 else	53 else

54 menu_.reset(new MenuGtk(NULL, model));	54 menu_.reset(new MenuGtk(NULL, model));

55 }	55 }

56	56

57 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) {	57 void StatusIconGtk::OnPopupMenu(GtkWidget* widget, guint button, guint time) {

58 // If we have a menu - display it.	58 // If we have a menu - display it.

59 if (menu_.get())	59 if (menu_.get())

60 menu_->PopupAsContextForStatusIcon(time, button, icon_);	60 menu_->PopupAsContextForStatusIcon(time, button, icon_);

61 }	61 }

OLD	NEW