chrome/browser/views/toolbar_view.cc - Issue 24011: chrome_resources take 2

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/views/toolbar_view.cc

Issue 24011: chrome_resources take 2 (Closed)

Patch Set: rebase Created 11 years, 10 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

« no previous file with comments | « chrome/browser/views/toolbar_star_toggle.cc ('k') | chrome/chrome.sln » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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/views/toolbar_view.h"	5 #include "chrome/browser/views/toolbar_view.h"

6	6

7 #include <string>	7 #include <string>

8	8

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

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "chrome/app/chrome_dll_resource.h"	11 #include "chrome/app/chrome_dll_resource.h"

12 #include "chrome/app/theme/theme_resources.h"	12 #include "grit/theme_resources.h"

13 #include "chrome/browser/bookmarks/bookmark_drag_data.h"	13 #include "chrome/browser/bookmarks/bookmark_drag_data.h"

14 #include "chrome/browser/bookmarks/bookmark_model.h"	14 #include "chrome/browser/bookmarks/bookmark_model.h"

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

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

17 #include "chrome/browser/character_encoding.h"	17 #include "chrome/browser/character_encoding.h"

18 #include "chrome/browser/drag_utils.h"	18 #include "chrome/browser/drag_utils.h"

19 #include "chrome/browser/metrics/user_metrics.h"	19 #include "chrome/browser/metrics/user_metrics.h"

20 #include "chrome/browser/profile.h"	20 #include "chrome/browser/profile.h"

21 #include "chrome/browser/tab_contents/navigation_controller.h"	21 #include "chrome/browser/tab_contents/navigation_controller.h"

22 #include "chrome/browser/tab_contents/navigation_entry.h"	22 #include "chrome/browser/tab_contents/navigation_entry.h"

(...skipping 796 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
819 *accel = views::Accelerator(L'C', false, true, false);	819 *accel = views::Accelerator(L'C', false, true, false);

820 return true;	820 return true;

821 case IDC_PASTE:	821 case IDC_PASTE:

822 *accel = views::Accelerator(L'V', false, true, false);	822 *accel = views::Accelerator(L'V', false, true, false);

823 return true;	823 return true;

824 }	824 }

825 // Else, we retrieve the accelerator information from the frame.	825 // Else, we retrieve the accelerator information from the frame.

826 return GetWidget()->GetAccelerator(id, accel);	826 return GetWidget()->GetAccelerator(id, accel);

827 }	827 }

828	828

OLD	NEW