chrome/browser/views/shelf_item_dialog.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/shelf_item_dialog.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/sad_tab_view.cc ('k') | chrome/browser/views/star_toggle.cc » ('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/shelf_item_dialog.h"	5 #include "chrome/browser/views/shelf_item_dialog.h"

6	6

7 #include "base/gfx/png_decoder.h"	7 #include "base/gfx/png_decoder.h"

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

9 #include "chrome/app/locales/locale_settings.h"	9 #include "chrome/app/locales/locale_settings.h"

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

11 #include "chrome/browser/net/url_fixer_upper.h"	11 #include "chrome/browser/net/url_fixer_upper.h"

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

13 #include "chrome/browser/tab_contents/tab_contents.h"	13 #include "chrome/browser/tab_contents/tab_contents.h"

14 #include "chrome/browser/views/standard_layout.h"	14 #include "chrome/browser/views/standard_layout.h"

15 #include "chrome/common/gfx/text_elider.h"	15 #include "chrome/common/gfx/text_elider.h"

16 #include "chrome/common/l10n_util.h"	16 #include "chrome/common/l10n_util.h"

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

18 #include "chrome/common/pref_service.h"	18 #include "chrome/common/pref_service.h"

19 #include "chrome/common/resource_bundle.h"	19 #include "chrome/common/resource_bundle.h"

20 #include "chrome/common/stl_util-inl.h"	20 #include "chrome/common/stl_util-inl.h"

(...skipping 488 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
509 PerformModelChange();	509 PerformModelChange();

510 if (window())	510 if (window())

511 window()->Close();	511 window()->Close();

512 }	512 }

513 }	513 }

514	514

515 GURL ShelfItemDialog::GetInputURL() const {	515 GURL ShelfItemDialog::GetInputURL() const {

516 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L""));	516 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L""));

517 }	517 }

518	518

OLD	NEW