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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 13937002: Really fix build after r193020. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 810
811 // TODO(beng): figure out how to juggle this. 811 // TODO(beng): figure out how to juggle this.
812 gfx::NativeWindow parent_window = window_->GetNativeWindow(); 812 gfx::NativeWindow parent_window = window_->GetNativeWindow();
813 ui::SelectFileDialog::FileTypeInfo file_types; 813 ui::SelectFileDialog::FileTypeInfo file_types;
814 file_types.support_drive = true; 814 file_types.support_drive = true;
815 select_file_dialog_->SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE, 815 select_file_dialog_->SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE,
816 string16(), 816 string16(),
817 directory, 817 directory,
818 &file_types, 818 &file_types,
819 0, 819 0,
820 FILE_PATH_LITERAL(std::string()), 820 base::FilePath::StringType(),
821 parent_window, 821 parent_window,
822 NULL); 822 NULL);
823 } 823 }
824 824
825 void Browser::UpdateDownloadShelfVisibility(bool visible) { 825 void Browser::UpdateDownloadShelfVisibility(bool visible) {
826 if (GetStatusBubble()) 826 if (GetStatusBubble())
827 GetStatusBubble()->UpdateDownloadShelfVisibility(visible); 827 GetStatusBubble()->UpdateDownloadShelfVisibility(visible);
828 } 828 }
829 829
830 /////////////////////////////////////////////////////////////////////////////// 830 ///////////////////////////////////////////////////////////////////////////////
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2238 if (contents && !allow_js_access) { 2238 if (contents && !allow_js_access) {
2239 contents->web_contents()->GetController().LoadURL( 2239 contents->web_contents()->GetController().LoadURL(
2240 target_url, 2240 target_url,
2241 content::Referrer(), 2241 content::Referrer(),
2242 content::PAGE_TRANSITION_LINK, 2242 content::PAGE_TRANSITION_LINK,
2243 std::string()); // No extra headers. 2243 std::string()); // No extra headers.
2244 } 2244 }
2245 2245
2246 return contents != NULL; 2246 return contents != NULL;
2247 } 2247 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698